summaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/acpiphp_glue.c
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2010-01-29 17:48:52 +0100
committerLen Brown <len.brown@intel.com>2010-01-31 21:43:32 -0500
commit7779688fc3d1ceddad84846a7b0affbe8e78ec6e (patch)
treefff56e1fea8656749666280b857ecac04560e70a /drivers/pci/hotplug/acpiphp_glue.c
parentd2f6650a950dadd20667a04a9dc785f240d43695 (diff)
downloadkernel-crypto-7779688fc3d1ceddad84846a7b0affbe8e78ec6e.tar.gz
kernel-crypto-7779688fc3d1ceddad84846a7b0affbe8e78ec6e.tar.xz
kernel-crypto-7779688fc3d1ceddad84846a7b0affbe8e78ec6e.zip
ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found
Callers (acpi_memhotplug.c, dock.c and others) check for the return value of acpi_bus_add() and assume a valid device was returned in case zero was returned. Thus return -ENODEV if no device was found in acpi_bus_scan and propagate this through acpi_bus_add and acpi_bus_start. Also remove a confusing comment in acpiphp_glue.c, acpi_bus_scan will and cannot invoke if acpi_bus_add returns no valid device. Signed-off-by: Thomas Renninger <trenn@suse.de> Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 8e952fdab76..cb2fd01edda 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -720,12 +720,6 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
-ret_val);
goto acpiphp_bus_add_out;
}
- /*
- * try to start anyway. We could have failed to add
- * simply because this bus had previously been added
- * on another add. Don't bother with the return value
- * we just keep going.
- */
ret_val = acpi_bus_start(device);
acpiphp_bus_add_out: