Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Yang Yingliang and committed by
Helge Deller
ed359a46 eceadc92

+7 -2
+7 -2
drivers/video/fbdev/pm2fb.c
··· 1533 1533 } 1534 1534 1535 1535 info = framebuffer_alloc(sizeof(struct pm2fb_par), &pdev->dev); 1536 - if (!info) 1537 - return -ENOMEM; 1536 + if (!info) { 1537 + err = -ENOMEM; 1538 + goto err_exit_disable; 1539 + } 1538 1540 default_par = info->par; 1539 1541 1540 1542 switch (pdev->device) { ··· 1717 1715 release_mem_region(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len); 1718 1716 err_exit_neither: 1719 1717 framebuffer_release(info); 1718 + err_exit_disable: 1719 + pci_disable_device(pdev); 1720 1720 return retval; 1721 1721 } 1722 1722 ··· 1743 1739 fb_dealloc_cmap(&info->cmap); 1744 1740 kfree(info->pixmap.addr); 1745 1741 framebuffer_release(info); 1742 + pci_disable_device(pdev); 1746 1743 } 1747 1744 1748 1745 static const struct pci_device_id pm2fb_id_table[] = {