fbdev: pm2fb: fix missing pci_disable_device()
[ Upstream commit ed359a464846b48f76ea6cc5cd8257e545ac97f4 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
3aa4205134
commit
9827246333
@ -1530,8 +1530,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) {
|
||||
@ -1712,6 +1714,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;
|
||||
}
|
||||
|
||||
@ -1738,6 +1742,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[] = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user