[PATCH] RPA PCI Hotplug - Remove Adapter Config at DLPAR add time

[John Rose]

Patch below fixes:
https://bugzilla.linux.ibm.com/show_bug.cgi?id=6136

Details in bug if you're interested, comments welcome.

Thanks-
John

diff -Nru a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
--- a/drivers/pci/hotplug/rpaphp_core.c	Wed Feb  4 18:42:00 2004
+++ b/drivers/pci/hotplug/rpaphp_core.c	Wed Feb  4 18:42:00 2004
@@ -814,29 +814,16 @@
 					}

 					slot->dev = rpaphp_find_adapter_pdev(slot);
-
-					if (!slot->dev && slot_name) {
-						 /* adapter being added doesn't have pci_dev yet */
-						slot->dev = rpaphp_config_adapter(slot);
-						if (!slot->dev) {
-							err("%s: add new adapter device for slot[%s] failed\n",
-							__FUNCTION__, slot->name);
-							kfree(slot->hotplug_slot->info);
-							kfree(slot->hotplug_slot->name);
-							kfree(slot->hotplug_slot);
-							kfree(slot);
-							pci_dev_put(slot->bridge);
-							continue;
-
-						}
-					}
-
 					if(slot->dev) {
 						slot->state = CONFIGURED;
 						pci_dev_get(slot->dev);
 					}
-					else
+					else {
+						/* DLPAR add as opposed to
+						 * boot time */
 						slot->state = NOT_CONFIGURED;
+					}
+
 				}
 				dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n",
 					__FUNCTION__, dn->full_name, slot->index, slot->name,


** Sent via the linuxppc64-dev mail list. See http://lists.linuxppc.org/