Commit ab20440c authored Oct 17, 2008 by Taku Izumi Committed by Jesse Barnes Oct 22, 2008

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>

parent adf411b8

drivers/pci/pci-acpi.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/**