From 74a712a11e6fe69831cff9cf3abc6437d4acb8f8 Mon Sep 17 00:00:00 2001 From: Carlos Corbacho Date: Thu, 13 Dec 2007 01:00:06 +0000 Subject: [PATCH] wmi-acer: More fixes for GUID queries --- wmi-acer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wmi-acer.c b/wmi-acer.c index 1d43f29..f67c056 100644 --- a/wmi-acer.c +++ b/wmi-acer.c @@ -334,7 +334,7 @@ struct acpi_buffer *out) struct guid_block *block = NULL; struct wmi_block *wblock = NULL; acpi_handle handle, wc_handle = NULL; - acpi_status status; + acpi_status status, wc_status; struct acpi_object_list input, wc_input; union acpi_object wc_params[1], wq_params[1]; char method[4] = "WQ"; @@ -378,13 +378,13 @@ struct acpi_buffer *out) * expensive, but have no corresponding WCxx method. So we * should not fail if this happens. */ - status = acpi_get_handle(handle, wc_method, wc_handle); - if (ACPI_SUCCESS(status)) { - status = acpi_evaluate_object(wc_handle, NULL, + wc_status = acpi_get_handle(handle, wc_method, wc_handle); + if (ACPI_SUCCESS(wc_status)) { + wc_status = acpi_evaluate_object(wc_handle, NULL, &wc_input, NULL); - if (ACPI_FAILURE(status)) - return status; + if (ACPI_FAILURE(wc_status)) + return wc_status; } } @@ -397,7 +397,7 @@ struct acpi_buffer *out) * If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if * the WQxx method failed - we should disable collection anyway */ - if (block->flags & ACPI_WMI_EXPENSIVE) { + if ((block->flags & ACPI_WMI_EXPENSIVE) && ACPI_SUCCESS(wc_status)) { wc_params[0].integer.value = 0; status = acpi_evaluate_object(handle, wc_method, &wc_input, NULL); -- 2.11.4.GIT