Commit ed359a46 authored by Yang Yingliang's avatar Yang Yingliang Committed by Helge Deller

fbdev: pm2fb: fix missing pci_disable_device()

Add missing pci_disable_device() in error path of probe() and remove() path.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent eceadc92
...@@ -1533,8 +1533,10 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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); info = framebuffer_alloc(sizeof(struct pm2fb_par), &pdev->dev);
if (!info) if (!info) {
return -ENOMEM; err = -ENOMEM;
goto err_exit_disable;
}
default_par = info->par; default_par = info->par;
switch (pdev->device) { switch (pdev->device) {
...@@ -1715,6 +1717,8 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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); release_mem_region(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len);
err_exit_neither: err_exit_neither:
framebuffer_release(info); framebuffer_release(info);
err_exit_disable:
pci_disable_device(pdev);
return retval; return retval;
} }
...@@ -1739,6 +1743,7 @@ static void pm2fb_remove(struct pci_dev *pdev) ...@@ -1739,6 +1743,7 @@ static void pm2fb_remove(struct pci_dev *pdev)
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
kfree(info->pixmap.addr); kfree(info->pixmap.addr);
framebuffer_release(info); framebuffer_release(info);
pci_disable_device(pdev);
} }
static const struct pci_device_id pm2fb_id_table[] = { static const struct pci_device_id pm2fb_id_table[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment