---

yaml --- r: 53372 b: refs/heads/master c: 6f79eb7 h: refs/heads/master v: v3
git-mirror · May 3, 2007 · 8750f36 · 8750f36
1 parent 00e3549
commit 8750f36
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -136,6 +136,6 @@ int rpaphp_register_pci_slot(struct slot *slot)
 		}
 	}
 
-	return rpaphp_register_slot(slot);
+	return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,6 +136,6 @@ int rpaphp_register_pci_slot(struct slot *slot) @@
     		}
     	}
-    	return rpaphp_register_slot(slot);
+    	return 0;
     }