ACPI: WMI: Clean up handling of spec violating data blocks

Acer violate the ACPI-WMI spec by declaring some of their data blocks as
expensive, but with no corresponding WCxx method. There is already some
workaround code in to handle the initial WCxx call (we just ignore a
failure here); but we need to properly check if the second, "clean up",
WCxx call is actually needed or not, rather than fail simply because it
isn't there.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c
index efacc9f8bfe3..c33b1c6e93b1 100644
--- a/drivers/acpi/wmi.c
+++ b/drivers/acpi/wmi.c
@@ -293,7 +293,7 @@ struct acpi_buffer *out)
 {
         struct guid_block *block = NULL;
         struct wmi_block *wblock = NULL;
-        acpi_handle handle;
+        acpi_handle handle, wc_handle;
         acpi_status status, wc_status = AE_ERROR;
         struct acpi_object_list input, wc_input;
         union acpi_object wc_params[1], wq_params[1];
@@ -338,8 +338,10 @@ struct acpi_buffer *out)
                  * expensive, but have no corresponding WCxx method. So we
                  * should not fail if this happens.
                  */
-                wc_status = acpi_evaluate_object(handle, wc_method,
-                        &wc_input, NULL);
+                wc_status = acpi_get_handle(handle, wc_method, &wc_handle);
+                if (ACPI_SUCCESS(wc_status))
+                        wc_status = acpi_evaluate_object(handle, wc_method,
+                                &wc_input, NULL);
         }
 
         strcpy(method, "WQ");
@@ -351,7 +353,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) && wc_status) {
+        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);