ChangeSet 1.1587.12.48, 2004/04/30 14:24:30-07:00, greg@kroah.com
PCI Hotplug: fix stupid build bugs caused by previous patches.
Doesn't anyone build their patches anymore before sending them out...
drivers/pci/hotplug/cpci_hotplug_core.c | 4 ----
drivers/pci/hotplug/cpqphp_pci.c | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff -Nru a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
--- a/drivers/pci/hotplug/cpci_hotplug_core.c Mon May 17 17:01:02 2004
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c Mon May 17 17:01:02 2004
@@ -94,10 +94,6 @@
dbg("%s - slot == NULL", function);
return -1;
}
- if(slot->magic != SLOT_MAGIC) {
- dbg("%s - bad magic number for slot", function);
- return -1;
- }
if(!slot->hotplug_slot) {
dbg("%s - slot->hotplug_slot == NULL!", function);
return -1;
diff -Nru a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
--- a/drivers/pci/hotplug/cpqphp_pci.c Mon May 17 17:01:02 2004
+++ b/drivers/pci/hotplug/cpqphp_pci.c Mon May 17 17:01:02 2004
@@ -1369,7 +1369,7 @@
// The second condition is to ignore bus numbers on
// populated slots that don't have PCI-PCI bridges
if (secondary_bus && (secondary_bus != primary_bus)) {
- bus_node = kmalloc(sizeof(*bus_mode), GFP_KERNEL);
+ bus_node = kmalloc(sizeof(*bus_node), GFP_KERNEL);
if (!bus_node)
return -ENOMEM;