1 files changed, 29 insertions, 15 deletions

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index a5e048fb8b38..671c3852d359 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1849,11 +1849,15 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
                                 info->irq_setup = std_irq_setup;
                         info->slave_addr = ipmb;
 
-                        if (!add_smi(info)) {
-                                if (try_smi_init(info))
-                                        cleanup_one_si(info);
-                        } else {
+                        rv = add_smi(info);
+                        if (rv) {
                                 kfree(info);
+                                goto out;
+                        }
+                        rv = try_smi_init(info);
+                        if (rv) {
+                                cleanup_one_si(info);
+                                goto out;
                         }
                 } else {
                         /* remove */
@@ -2067,6 +2071,7 @@ struct SPMITable {
 static int try_init_spmi(struct SPMITable *spmi)
 {
         struct smi_info  *info;
+        int rv;
 
         if (spmi->IPMIlegacy != 1) {
                 printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
@@ -2141,10 +2146,11 @@ static int try_init_spmi(struct SPMITable *spmi)
                  info->io.addr_data, info->io.regsize, info->io.regspacing,
                  info->irq);
 
-        if (add_smi(info))
+        rv = add_smi(info);
+        if (rv)
                 kfree(info);
 
-        return 0;
+        return rv;
 }
 
 static void spmi_find_bmc(void)
@@ -2178,6 +2184,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
         acpi_handle handle;
         acpi_status status;
         unsigned long long tmp;
+        int rv;
 
         acpi_dev = pnp_acpi_device(dev);
         if (!acpi_dev)
@@ -2259,10 +2266,11 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
                  res, info->io.regsize, info->io.regspacing,
                  info->irq);
 
-        if (add_smi(info))
-                goto err_free;
+        rv = add_smi(info);
+        if (rv)
+                kfree(info);
 
-        return 0;
+        return rv;
 
 err_free:
         kfree(info);
@@ -2566,16 +2574,20 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
                 &pdev->resource[0], info->io.regsize, info->io.regspacing,
                 info->irq);
 
-        if (add_smi(info))
+        rv = add_smi(info);
+        if (rv) {
                 kfree(info);
+                pci_disable_device(pdev);
+        }
 
-        return 0;
+        return rv;
 }
 
 static void ipmi_pci_remove(struct pci_dev *pdev)
 {
         struct smi_info *info = pci_get_drvdata(pdev);
         cleanup_one_si(info);
+        pci_disable_device(pdev);
 }
 
 static struct pci_device_id ipmi_pci_devices[] = {
@@ -2670,9 +2682,10 @@ static int ipmi_probe(struct platform_device *dev)
 
         dev_set_drvdata(&dev->dev, info);
 
-        if (add_smi(info)) {
+        ret = add_smi(info);
+        if (ret) {
                 kfree(info);
-                return -EBUSY;
+                return ret;
         }
 #endif
         return 0;
@@ -2736,9 +2749,10 @@ static int ipmi_parisc_probe(struct parisc_device *dev)
 
         dev_set_drvdata(&dev->dev, info);
 
-        if (add_smi(info)) {
+        rv = add_smi(info);
+        if (rv) {
                 kfree(info);
-                return -EBUSY;
+                return rv;
         }
 
         return 0;