diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-29 07:58:34 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-29 07:58:34 -0500 |
| commit | 64e94e7e0ffb20ee11a596aa04fcdeefb33e000d (patch) | |
| tree | 9ef0331d6c207b54502906c239b40220e8113502 /drivers/pci | |
| parent | 2c0d4fe0189ae5e29fd9602d5b83f3b2b169bd1b (diff) | |
| parent | c511cc1990bbc263c3f8a2ef4d7d613a3b40ffe2 (diff) | |
Merge branch 'acpi-scan' into acpi-cleanup
The following commits depend on the 'acpi-scan' material.
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 9e2b1f6dbe41..d1a6f4a25da8 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
| @@ -742,8 +742,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func) | |||
| 742 | /* this shouldn't be in here, so remove | 742 | /* this shouldn't be in here, so remove |
| 743 | * the bus then re-add it... | 743 | * the bus then re-add it... |
| 744 | */ | 744 | */ |
| 745 | ret_val = acpi_bus_trim(device); | 745 | acpi_bus_trim(device); |
| 746 | dbg("acpi_bus_trim return %x\n", ret_val); | ||
| 747 | } | 746 | } |
| 748 | 747 | ||
| 749 | ret_val = acpi_bus_scan(func->handle); | 748 | ret_val = acpi_bus_scan(func->handle); |
| @@ -772,11 +771,8 @@ static int acpiphp_bus_trim(acpi_handle handle) | |||
| 772 | return retval; | 771 | return retval; |
| 773 | } | 772 | } |
| 774 | 773 | ||
| 775 | retval = acpi_bus_trim(device); | 774 | acpi_bus_trim(device); |
| 776 | if (retval) | 775 | return 0; |
| 777 | err("cannot remove from acpi list\n"); | ||
| 778 | |||
| 779 | return retval; | ||
| 780 | } | 776 | } |
| 781 | 777 | ||
| 782 | static void acpiphp_set_acpi_region(struct acpiphp_slot *slot) | 778 | static void acpiphp_set_acpi_region(struct acpiphp_slot *slot) |