diff --git a/[refs] b/[refs]
index 3af0d0f77136..e4264db694c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c02929c278f2bca68635e4c2daa00b7825d71061
+refs/heads/master: 6f79eb749df7f1eea76c947f31603ade7d2b5f6d
diff --git a/trunk/drivers/pci/hotplug/rpaphp_core.c b/trunk/drivers/pci/hotplug/rpaphp_core.c
index e9c157d30e82..d8e5f9fd357d 100644
--- a/trunk/drivers/pci/hotplug/rpaphp_core.c
+++ b/trunk/drivers/pci/hotplug/rpaphp_core.c
@@ -319,6 +319,9 @@ int rpaphp_add_slot(struct device_node *dn)
 				indexes[i + 1], name, type);
 
 		retval = rpaphp_register_pci_slot(slot);
+		if (!retval)
+			retval = rpaphp_register_slot(slot);
+
 		if (retval)
 			dealloc_slot_struct(slot);
 
diff --git a/trunk/drivers/pci/hotplug/rpaphp_pci.c b/trunk/drivers/pci/hotplug/rpaphp_pci.c
index 6271be8b155e..2e297b9ffa75 100644
--- a/trunk/drivers/pci/hotplug/rpaphp_pci.c
+++ b/trunk/drivers/pci/hotplug/rpaphp_pci.c
@@ -136,6 +136,6 @@ int rpaphp_register_pci_slot(struct slot *slot)
 		}
 	}
 
-	return rpaphp_register_slot(slot);
+	return 0;
 }