From daef066b0817081d4b33bf20e637b76d2f8dae87 Mon Sep 17 00:00:00 2001 From: Taku Izumi Date: Fri, 17 Oct 2008 13:51:53 +0900 Subject: [PATCH] --- yaml --- r: 117203 b: refs/heads/master c: ab20440c376ff0454cb93904a888212d874fbb6b h: refs/heads/master i: 117201: 913ffc4ced456722cf9898e6a21ef081ce2b2f96 117199: ba1905e67fe7f2a3aef6a28ae89783dbfc63e807 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci-acpi.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f85a2f4eef02..c5d6868e0b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adf411b819adc9fa96e9b3e638c7480d5e71d270 +refs/heads/master: ab20440c376ff0454cb93904a888212d874fbb6b diff --git a/trunk/drivers/pci/pci-acpi.c b/trunk/drivers/pci/pci-acpi.c index 981919d163a0..dfe7c8e1b185 100644 --- a/trunk/drivers/pci/pci-acpi.c +++ b/trunk/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; } /**