diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-04 05:02:55 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-04 05:02:55 +0300 |
| commit | 2c3cd66f4c66b169c18a2dbebbc894681d282278 (patch) | |
| tree | 9d2e055ea43e177914a4cce9d007982a7417623c /drivers/gpu/drm/bochs | |
| parent | 7fbd5d784f75750199c21918da9b2fc92af371e6 (diff) | |
| parent | 1c163f4c7b3f621efff9b28a47abb36f7378d783 (diff) | |
| download | linux-2c3cd66f4c66b169c18a2dbebbc894681d282278.tar.xz | |
Merge v5.0 into drm-next
There is a really hairy resolution involving amdgpu fixes, that I'd rather confirm here.
Also some misc fixes are landed by me, but the pr has them as well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/bochs')
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_drv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index cb55bdc36f3f..6b6e037258c3 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -145,6 +145,10 @@ static int bochs_pci_probe(struct pci_dev *pdev, if (IS_ERR(dev)) return PTR_ERR(dev); + ret = pci_enable_device(pdev); + if (ret) + goto err_free_dev; + dev->pdev = pdev; pci_set_drvdata(pdev, dev); |