From: Taku Izumi Date: Fri, 17 Oct 2008 04:51:53 +0000 (+0900) Subject: ACPI/PCI: Fix return value of acpi_cuery_osc() X-Git-Tag: v2.6.28-rc1~29^2~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ab20440c376ff0454cb93904a888212d874fbb6b;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Taku Izumi Signed-off-by: Jesse Barnes --- diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 981919d163a..dfe7c8e1b18 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; } /**