diff options
| author | Yang Yingliang <yangyingliang@huawei.com> | 2022-11-12 10:55:10 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-12-14 20:01:50 +0100 |
| commit | ed359a464846b48f76ea6cc5cd8257e545ac97f4 (patch) | |
| tree | 02695fb4ec10a87fe57f99d62da7c26140e81af3 /drivers/video/fbdev/pm2fb.c | |
| parent | fbdev: pxafb: Remove unnecessary print function dev_err() (diff) | |
| download | linux-ed359a464846b48f76ea6cc5cd8257e545ac97f4.tar.xz linux-ed359a464846b48f76ea6cc5cd8257e545ac97f4.zip | |
fbdev: pm2fb: fix missing pci_disable_device()
Add missing pci_disable_device() in error path of probe() and remove() path.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to '')
| -rw-r--r-- | drivers/video/fbdev/pm2fb.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c index 0823c9de859a..47d212944f30 100644 --- a/drivers/video/fbdev/pm2fb.c +++ b/drivers/video/fbdev/pm2fb.c @@ -1533,8 +1533,10 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) } info = framebuffer_alloc(sizeof(struct pm2fb_par), &pdev->dev); - if (!info) - return -ENOMEM; + if (!info) { + err = -ENOMEM; + goto err_exit_disable; + } default_par = info->par; switch (pdev->device) { @@ -1715,6 +1717,8 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) release_mem_region(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len); err_exit_neither: framebuffer_release(info); + err_exit_disable: + pci_disable_device(pdev); return retval; } @@ -1739,6 +1743,7 @@ static void pm2fb_remove(struct pci_dev *pdev) fb_dealloc_cmap(&info->cmap); kfree(info->pixmap.addr); framebuffer_release(info); + pci_disable_device(pdev); } static const struct pci_device_id pm2fb_id_table[] = { |