diff options
| author | Samuel Iglesias Gonsálvez <siglesias@igalia.com> | 2012-09-11 11:35:04 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 19:18:11 (GMT) |
| commit | 7987812295cd734a3ba55c9cd02f16fbaec64ace (patch) | |
| tree | fb09c722a7b38211f9a5ff0357c8916d744a41e7 /drivers/staging/ipack | |
| parent | a92caeb8e1189f190ac13bb5e745446b25b09ae5 (diff) | |
| download | linux-7987812295cd734a3ba55c9cd02f16fbaec64ace.tar.xz | |
Staging: ipack/bridges/tpci200: reorder the iounmap and pci_release_region
Move iounmap and pci_release_region to tpci200_unregister(), as it is the place
where the clean-up of the device is done.
Also, renamed iounmap() to pci_iounmap() as the mapped region was requested
from PCI bus.
Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ipack')
| -rw-r--r-- | drivers/staging/ipack/bridges/tpci200.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index 22e3da1..383571c 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -64,10 +64,12 @@ static void tpci200_unregister(struct tpci200_board *tpci200) pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs); pci_iounmap(tpci200->info->pdev, tpci200->info->ioidint_space); pci_iounmap(tpci200->info->pdev, tpci200->info->mem8_space); + pci_iounmap(tpci200->info->pdev, tpci200->info->cfg_regs); pci_release_region(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR); pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR); pci_release_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR); + pci_release_region(tpci200->info->pdev, TPCI200_CFG_MEM_BAR); pci_disable_device(tpci200->info->pdev); pci_dev_put(tpci200->info->pdev); @@ -750,9 +752,6 @@ static void __tpci200_pci_remove(struct tpci200_board *tpci200) tpci200_uninstall(tpci200); ipack_bus_unregister(tpci200->info->ipack_bus); - iounmap(tpci200->info->cfg_regs); - pci_release_region(tpci200->info->pdev, TPCI200_CFG_MEM_BAR); - kfree(tpci200->info); kfree(tpci200); } |