diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-09-20 16:10:48 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-09-23 09:40:36 +0200 |
| commit | 2df94510c5dd312e48ce892e4927a323181d27ac (patch) | |
| tree | 2f5deac6563708b61a1ec588efad563866145a4b | |
| parent | drm/gma500: Replace references to dev_private with helper function (diff) | |
| download | linux-2df94510c5dd312e48ce892e4927a323181d27ac.tar.xz linux-2df94510c5dd312e48ce892e4927a323181d27ac.zip | |
drm/gma500: Disable PCI device during shutdown
Use managed disablement of PCI devices via pcim_device_enable().
Disables the PCI device and simplifies error rollback in probe
function.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210920141051.30988-3-tzimmermann@suse.de
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 05f42e66af86..80ef2f0562c3 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -448,15 +448,13 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) struct drm_device *dev; int ret; - ret = pci_enable_device(pdev); + ret = pcim_enable_device(pdev); if (ret) return ret; dev = drm_dev_alloc(&driver, &pdev->dev); - if (IS_ERR(dev)) { - ret = PTR_ERR(dev); - goto err_pci_disable_device; - } + if (IS_ERR(dev)) + return PTR_ERR(dev); pci_set_drvdata(pdev, dev); @@ -474,8 +472,6 @@ err_psb_driver_unload: psb_driver_unload(dev); err_drm_dev_put: drm_dev_put(dev); -err_pci_disable_device: - pci_disable_device(pdev); return ret; } |