diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/sgi_hotplug.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 3d6d4fd1e3c5..7e2bad4c2fcc 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -759,7 +759,6 @@ static int acpiphp_bus_add(struct acpiphp_func *func) | |||
759 | -ret_val); | 759 | -ret_val); |
760 | goto acpiphp_bus_add_out; | 760 | goto acpiphp_bus_add_out; |
761 | } | 761 | } |
762 | ret_val = acpi_bus_start(device); | ||
763 | 762 | ||
764 | acpiphp_bus_add_out: | 763 | acpiphp_bus_add_out: |
765 | return ret_val; | 764 | return ret_val; |
@@ -1148,8 +1147,7 @@ static void handle_bridge_insertion(acpi_handle handle, u32 type) | |||
1148 | err("cannot add bridge to acpi list\n"); | 1147 | err("cannot add bridge to acpi list\n"); |
1149 | return; | 1148 | return; |
1150 | } | 1149 | } |
1151 | if (!acpiphp_configure_bridge(handle) && | 1150 | if (!acpiphp_configure_bridge(handle)) |
1152 | !acpi_bus_start(device)) | ||
1153 | add_bridge(handle); | 1151 | add_bridge(handle); |
1154 | else | 1152 | else |
1155 | err("cannot configure and start bridge\n"); | 1153 | err("cannot configure and start bridge\n"); |
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c index f64ca92253da..20c960d5317d 100644 --- a/drivers/pci/hotplug/sgi_hotplug.c +++ b/drivers/pci/hotplug/sgi_hotplug.c | |||
@@ -457,8 +457,6 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) | |||
457 | ret, (int)(adr>>16), | 457 | ret, (int)(adr>>16), |
458 | (int)(adr&0xffff)); | 458 | (int)(adr&0xffff)); |
459 | /* try to continue on */ | 459 | /* try to continue on */ |
460 | } else { | ||
461 | acpi_bus_start(device); | ||
462 | } | 460 | } |
463 | } | 461 | } |
464 | } | 462 | } |