Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 981919d163a0502f3b8eb9e3c6f3850cb0616daa..dfe7c8e1b18586fa9da406cd365bbfb14188ec97 100644 (file)
--- 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;
 }
 
 /**