3 files changed, 5 insertions, 2 deletions

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 3afd154bf543..ca95e1515d6f 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -321,10 +321,15 @@ int rpaphp_add_slot(struct device_node *dn)
                                 indexes[i + 1], name, type);
 
                 retval = rpaphp_register_pci_slot(slot);
+                if (retval)
+                        dealloc_slot_struct(slot);
+
                 name += strlen(name) + 1;
                 type += strlen(type) + 1;
         }
         dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
+        /* XXX FIXME: reports a failure only if last entry in loop failed */
         return retval;
 }
 
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 6f6cbede5135..a669ba3f29c9 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -195,7 +195,6 @@ static int setup_pci_slot(struct slot *slot)
         }
         return 0;
 exit_rc:
-        dealloc_slot_struct(slot);
         return -EINVAL;
 }
 
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 907f1301f84a..dd1e275a82ce 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -184,7 +184,6 @@ int rpaphp_register_slot(struct slot *slot)
 sysfs_fail:
         pci_hp_deregister(php_slot);
 register_fail:
-        rpaphp_release_slot(php_slot);
         return retval;
 }