From ab20440c376ff0454cb93904a888212d874fbb6b Mon Sep 17 00:00:00 2001 From: Taku Izumi Date: Fri, 17 Oct 2008 13:51:53 +0900 Subject: [PATCH] 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 --- drivers/pci/pci-acpi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 981919d163a0..dfe7c8e1b185 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; } /** -- 2.39.5