diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-18 23:35:24 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-18 23:35:24 +0000 |
| commit | 2b4f0175799a5d714ff7f83bba7eae6fca268834 (patch) | |
| tree | ec715b6a6526bdc8e8ae71c677d047f5de5da991 /drivers/pci/hotplug/acpiphp_glue.c | |
| parent | b857df1acc634b18db1db2a40864af985100266e (diff) | |
| parent | 083c88fcf1a89986ffa160826f96509fb4b370bb (diff) | |
| download | kernel_samsung_crespo-2b4f0175799a5d714ff7f83bba7eae6fca268834.zip kernel_samsung_crespo-2b4f0175799a5d714ff7f83bba7eae6fca268834.tar.gz kernel_samsung_crespo-2b4f0175799a5d714ff7f83bba7eae6fca268834.tar.bz2 | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 8e952fd..cb2fd01 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: |