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

fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove

Replace pci_enable_device() with pcim_enable_device(), pci_disable_device() and
pci_release_regions() will be called in release automatically.

Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Ruan Jinjie and committed by
Helge Deller
e82b0c3e 5610bcfe

+1 -5
+1 -5
drivers/video/fbdev/tridentfb.c
··· 1470 1470 if (err) 1471 1471 return err; 1472 1472 1473 - err = pci_enable_device(dev); 1473 + err = pcim_enable_device(dev); 1474 1474 if (err) 1475 1475 return err; 1476 1476 ··· 1710 1710 kfree(info->pixmap.addr); 1711 1711 if (info->screen_base) 1712 1712 iounmap(info->screen_base); 1713 - release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len); 1714 1713 disable_mmio(info->par); 1715 1714 out_unmap1: 1716 1715 if (default_par->io_virt) 1717 1716 iounmap(default_par->io_virt); 1718 - release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len); 1719 1717 framebuffer_release(info); 1720 1718 return err; 1721 1719 } ··· 1728 1730 i2c_del_adapter(&par->ddc_adapter); 1729 1731 iounmap(par->io_virt); 1730 1732 iounmap(info->screen_base); 1731 - release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len); 1732 - release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len); 1733 1733 kfree(info->pixmap.addr); 1734 1734 fb_dealloc_cmap(&info->cmap); 1735 1735 framebuffer_release(info);