5 files changed, 87 insertions, 20 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 6fa58425466a..f575e8341aec 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -445,6 +445,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
         void __iomem *base;
         struct ide_host *host;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        int ret;
 
         base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
@@ -472,9 +473,15 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         ecard_set_drvdata(ec, state);
 
-        ide_host_register(host, NULL, hws);
+        ret = ide_host_register(host, NULL, hws);
+        if (ret)
+                goto err_free;
 
         return 0;
+err_free:
+        ide_host_free(host);
+        ecard_set_drvdata(ec, NULL);
+        return ret;
 }
 
 static const struct ide_port_info icside_v6_port_info __initdata = {
@@ -547,11 +554,17 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
                 d.dma_ops = NULL;
         }
 
-        ide_host_register(host, &d, hws);
+        ret = ide_host_register(host, NULL, hws);
+        if (ret)
+                goto err_free;
 
         return 0;
-
- out:
+err_free:
+        ide_host_free(host);
+        if (d.dma_ops)
+                free_dma(ec->dma);
+        ecard_set_drvdata(ec, NULL);
+out:
         return ret;
 }
 
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index a7082c28d06f..31d98fec775f 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -84,13 +84,14 @@ static int __init ide_generic_init(void)
 {
         hw_regs_t hw[MAX_HWIFS], *hws[MAX_HWIFS];
         struct ide_host *host;
-        int i;
+        unsigned long io_addr;
+        int i, rc;
 
         printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "
                          "parameter for probing all legacy ISA IDE ports\n");
 
         for (i = 0; i < MAX_HWIFS; i++) {
-                unsigned long io_addr = ide_default_io_base(i);
+                io_addr = ide_default_io_base(i);
 
                 hws[i] = NULL;
 
@@ -120,14 +121,32 @@ static int __init ide_generic_init(void)
         }
 
         host = ide_host_alloc_all(NULL, hws);
-        if (host)
-                ide_host_register(host, NULL, hws);
+        if (host == NULL) {
+                rc = -ENOMEM;
+                goto err;
+        }
+
+        rc = ide_host_register(host, NULL, hws);
+        if (rc)
+                goto err_free;
 
         if (ide_generic_sysfs_init())
                 printk(KERN_ERR DRV_NAME ": failed to create ide_generic "
                                          "class\n");
 
         return 0;
+err_free:
+        ide_host_free(host);
+err:
+        for (i = 0; i < MAX_HWIFS; i++) {
+                if (hws[i] == NULL)
+                        continue;
+
+                io_addr = hws[i]->io_ports.data_addr;
+                release_region(io_addr + 0x206, 1);
+                release_region(io_addr, 8);
+        }
+        return rc;
 }
 
 module_init(ide_generic_init);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 6d57b7cd5424..0ead4537fc63 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1729,12 +1729,17 @@ int ide_host_add(const struct ide_port_info *d, hw_regs_t **hws,
                  struct ide_host **hostp)
 {
         struct ide_host *host;
+        int rc;
 
         host = ide_host_alloc(d, hws);
         if (host == NULL)
                 return -ENOMEM;
 
-        ide_host_register(host, d, hws);
+        rc = ide_host_register(host, d, hws);
+        if (rc) {
+                ide_host_free(host);
+                return rc;
+        }
 
         if (hostp)
                 *hostp = host;
@@ -1743,7 +1748,7 @@ int ide_host_add(const struct ide_port_info *d, hw_regs_t **hws,
 }
 EXPORT_SYMBOL_GPL(ide_host_add);
 
-void ide_host_remove(struct ide_host *host)
+void ide_host_free(struct ide_host *host)
 {
         ide_hwif_t *hwif;
         int i;
@@ -1754,13 +1759,25 @@ void ide_host_remove(struct ide_host *host)
                 if (hwif == NULL)
                         continue;
 
-                ide_unregister(hwif);
                 ide_free_port_slot(hwif->index);
                 kfree(hwif);
         }
 
         kfree(host);
 }
+EXPORT_SYMBOL_GPL(ide_host_free);
+
+void ide_host_remove(struct ide_host *host)
+{
+        int i;
+
+        for (i = 0; i < MAX_HWIFS; i++) {
+                if (host->ports[i])
+                        ide_unregister(host->ports[i]);
+        }
+
+        ide_host_free(host);
+}
 EXPORT_SYMBOL_GPL(ide_host_remove);
 
 void ide_port_scan(ide_hwif_t *hwif)
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 4eb5c3f9fecc..724f95073d80 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -114,9 +114,10 @@ static int __init falconide_init(void)
 {
         struct ide_host *host;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        int rc;
 
         if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE))
-                return 0;
+                return -ENODEV;
 
         printk(KERN_INFO "ide: Falcon IDE controller\n");
 
@@ -128,13 +129,24 @@ static int __init falconide_init(void)
         falconide_setup_ports(&hw);
 
         host = ide_host_alloc(&falconide_port_info, hws);
-        if (host) {
-                ide_get_lock(NULL, NULL);
-                ide_host_register(host, &falconide_port_info, hws);
-                ide_release_lock();
+        if (host == NULL) {
+                rc = -ENOMEM;
+                goto err;
         }
 
+        ide_get_lock(NULL, NULL);
+        rc = ide_host_register(host, &falconide_port_info, hws);
+        ide_release_lock();
+
+        if (rc)
+                goto err_free;
+
         return 0;
+err_free:
+        ide_host_free(host);
+err:
+        release_mem_region(ATA_HD_BASE, 0x40);
+        return rc;
 }
 
 module_init(falconide_init);
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 440f43a86ad3..42eef19a18f1 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -603,6 +603,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         struct ide_host *host;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         struct ide_port_info d = sgiioc4_port_info;
+        int rc;
 
         /*  Get the CmdBlk and CtrlBlk Base Registers */
         bar0 = pci_resource_start(dev, 0);
@@ -638,17 +639,22 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
 
         host = ide_host_alloc(&d, hws);
-        if (host == NULL)
+        if (host == NULL) {
+                rc = -ENOMEM;
                 goto err;
+        }
 
-        if (ide_host_register(host, &d, hws))
-                return -EIO;
+        rc = ide_host_register(host, &d, hws);
+        if (rc)
+                goto err_free;
 
         return 0;
+err_free:
+        ide_host_free(host);
 err:
         release_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE);
         iounmap(virt_base);
-        return -ENOMEM;
+        return rc;
 }
 
 static unsigned int __devinit