aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorTaku Izumi <izumi.taku@jp.fujitsu.com>2008-10-17 13:51:53 +0900
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-22 16:42:34 -0700
commitab20440c376ff0454cb93904a888212d874fbb6b (patch)
tree9fa9576287106ce99b582a89755f2ae627af2765 /drivers/pci
parentadf411b819adc9fa96e9b3e638c7480d5e71d270 (diff)
downloadkernel_samsung_aries-ab20440c376ff0454cb93904a888212d874fbb6b.zip
kernel_samsung_aries-ab20440c376ff0454cb93904a888212d874fbb6b.tar.gz
kernel_samsung_aries-ab20440c376ff0454cb93904a888212d874fbb6b.tar.bz2
ACPI/PCI: Fix return value of acpi_cuery_osc()
If acpi_query_osc() returns other than AE_OK, __pci_osc_support_set() stops scanning ACPI objects to evaluate _OSC. This prevents subsequent _OSCs from being evaluated if some of root bridge doesn't have _OSC, for example. So acpi_query_osc() should return always AE_OK to evaluate all _OSC. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-acpi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 981919d..dfe7c8e 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -149,20 +149,19 @@ static acpi_status acpi_query_osc(acpi_handle handle,
status = acpi_get_handle(handle, "_OSC", &tmp);
if (ACPI_FAILURE(status))
- return status;
+ return AE_OK;
mutex_lock(&pci_acpi_lock);
osc_data = acpi_get_osc_data(handle);
if (!osc_data) {
printk(KERN_ERR "acpi osc data array is full\n");
- status = AE_ERROR;
goto out;
}
- status = __acpi_query_osc(flags, osc_data, &dummy);
+ __acpi_query_osc(flags, osc_data, &dummy);
out:
mutex_unlock(&pci_acpi_lock);
- return status;
+ return AE_OK;
}
/**