Skip to content

Commit e82b0c3

Browse files
Ruan Jinjiehdeller
authored andcommitted
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>
1 parent 5610bcf commit e82b0c3

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/video/fbdev/tridentfb.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ static int trident_pci_probe(struct pci_dev *dev,
14701470
if (err)
14711471
return err;
14721472

1473-
err = pci_enable_device(dev);
1473+
err = pcim_enable_device(dev);
14741474
if (err)
14751475
return err;
14761476

@@ -1710,12 +1710,10 @@ static int trident_pci_probe(struct pci_dev *dev,
17101710
kfree(info->pixmap.addr);
17111711
if (info->screen_base)
17121712
iounmap(info->screen_base);
1713-
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
17141713
disable_mmio(info->par);
17151714
out_unmap1:
17161715
if (default_par->io_virt)
17171716
iounmap(default_par->io_virt);
1718-
release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
17191717
framebuffer_release(info);
17201718
return err;
17211719
}
@@ -1730,8 +1728,6 @@ static void trident_pci_remove(struct pci_dev *dev)
17301728
i2c_del_adapter(&par->ddc_adapter);
17311729
iounmap(par->io_virt);
17321730
iounmap(info->screen_base);
1733-
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
1734-
release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
17351731
kfree(info->pixmap.addr);
17361732
fb_dealloc_cmap(&info->cmap);
17371733
framebuffer_release(info);

0 commit comments

Comments
 (0)