Commit 784f8f37 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Deepak Saxena

PCI Hotplug: fix stupid build bugs caused by previous patches.

Doesn't anyone build their patches anymore before sending them out...
parent 226012f5
...@@ -94,10 +94,6 @@ slot_paranoia_check(struct slot *slot, const char *function) ...@@ -94,10 +94,6 @@ slot_paranoia_check(struct slot *slot, const char *function)
dbg("%s - slot == NULL", function); dbg("%s - slot == NULL", function);
return -1; return -1;
} }
if(slot->magic != SLOT_MAGIC) {
dbg("%s - bad magic number for slot", function);
return -1;
}
if(!slot->hotplug_slot) { if(!slot->hotplug_slot) {
dbg("%s - slot->hotplug_slot == NULL!", function); dbg("%s - slot->hotplug_slot == NULL!", function);
return -1; return -1;
......
...@@ -1369,7 +1369,7 @@ int cpqhp_find_available_resources (struct controller *ctrl, void *rom_start) ...@@ -1369,7 +1369,7 @@ int cpqhp_find_available_resources (struct controller *ctrl, void *rom_start)
// The second condition is to ignore bus numbers on // The second condition is to ignore bus numbers on
// populated slots that don't have PCI-PCI bridges // populated slots that don't have PCI-PCI bridges
if (secondary_bus && (secondary_bus != primary_bus)) { 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) if (!bus_node)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment