ide/ide-cs: fix order of releasing resources

[net-next-2.6.git] / drivers / ide / ide-cs.c

diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index dd6396384c25cd22f82149a4a188bd65aab35814..ab87e4f7cec913685fc8cdff98c727f260c18811 100644 (file)
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -121,19 +121,11 @@ static int ide_probe(struct pcmcia_device *link)
 static void ide_detach(struct pcmcia_device *link)
 {
     ide_info_t *info = link->priv;
-    ide_hwif_t *hwif = info->host->ports[0];
-    unsigned long data_addr, ctl_addr;
 
     dev_dbg(&link->dev, "ide_detach(0x%p)\n", link);
 
-    data_addr = hwif->io_ports.data_addr;
-    ctl_addr  = hwif->io_ports.ctl_addr;
-
     ide_release(link);
 
-    release_region(ctl_addr, 1);
-    release_region(data_addr, 8);
-
     kfree(info);
 } /* ide_detach */
 
@@ -354,12 +346,19 @@ static void ide_release(struct pcmcia_device *link)
 
     dev_dbg(&link->dev, "ide_release(0x%p)\n", link);
 
-    if (info->ndev)
-       /* FIXME: if this fails we need to queue the cleanup somehow
-          -- need to investigate the required PCMCIA magic */
+    if (info->ndev) {
+       ide_hwif_t *hwif = host->ports[0];
+       unsigned long data_addr, ctl_addr;
+
+       data_addr = hwif->io_ports.data_addr;
+       ctl_addr = hwif->io_ports.ctl_addr;
+
        ide_host_remove(host);
+       info->ndev = 0;
 
-    info->ndev = 0;
+       release_region(ctl_addr, 1);
+       release_region(data_addr, 8);
+    }
 
     pcmcia_disable_device(link);
 } /* ide_release */