Merge branch 'fixes' into devel

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 8781d8fa7a5..5b648f0c607 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -338,8 +338,13 @@ static void hp_wmi_notify(u32 value, void *context)
         static struct key_entry *key;
         union acpi_object *obj;
         int eventcode;
+        acpi_status status;
 
-        wmi_get_event_data(value, &response);
+        status = wmi_get_event_data(value, &response);
+        if (status != AE_OK) {
+                printk(KERN_INFO "hp-wmi: bad event status 0x%x\n", status);
+                return;
+        }
 
         obj = (union acpi_object *)response.pointer;
 
@@ -581,7 +586,7 @@ static int __init hp_wmi_init(void)
         if (wmi_has_guid(HPWMI_EVENT_GUID)) {
                 err = wmi_install_notify_handler(HPWMI_EVENT_GUID,
                                                  hp_wmi_notify, NULL);
-                if (!err)
+                if (ACPI_SUCCESS(err))
                         hp_wmi_input_setup();
         }