Commit e82b0c3e authored by Ruan Jinjie's avatar Ruan Jinjie Committed by Helge Deller
Browse files

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: default avatarruanjinjie <ruanjinjie@huawei.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 5610bcfe

drivers/video/fbdev/tridentfb.c

+1 −5
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ static int trident_pci_probe(struct pci_dev *dev, 
	if (err)

		return err;



	err = pci_enable_device(dev);

	err = pcim_enable_device(dev);

	if (err)

		return err;
@@ -1710,12 +1710,10 @@ static int trident_pci_probe(struct pci_dev *dev, 
	kfree(info->pixmap.addr);

	if (info->screen_base)

		iounmap(info->screen_base);

	release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);

	disable_mmio(info->par);

out_unmap1:

	if (default_par->io_virt)

		iounmap(default_par->io_virt);

	release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);

	framebuffer_release(info);

	return err;

}
@@ -1730,8 +1728,6 @@ static void trident_pci_remove(struct pci_dev *dev) 
		i2c_del_adapter(&par->ddc_adapter);

	iounmap(par->io_virt);

	iounmap(info->screen_base);

	release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);

	release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);

	kfree(info->pixmap.addr);

	fb_dealloc_cmap(&info->cmap);

	framebuffer_release(info);