1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 916ccb2b316c..1b1dddbd5744 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -202,8 +202,13 @@ static void dell_wmi_notify(u32 value, void *context)
         struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
         static struct key_entry *key;
         union acpi_object *obj;
+        acpi_status status;
 
-        wmi_get_event_data(value, &response);
+        status = wmi_get_event_data(value, &response);
+        if (status != AE_OK) {
+                printk(KERN_INFO "dell-wmi: bad event status 0x%x\n", status);
+                return;
+        }
 
         obj = (union acpi_object *)response.pointer;
 
@@ -323,8 +328,9 @@ static int __init dell_wmi_input_setup(void)
 static int __init dell_wmi_init(void)
 {
         int err;
+        acpi_status status;
 
-        if (wmi_has_guid(DELL_EVENT_GUID)) {
+        if (!wmi_has_guid(DELL_EVENT_GUID)) {
                 printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
                 return -ENODEV;
         }
@@ -336,14 +342,14 @@ static int __init dell_wmi_init(void)
         if (err)
                 return err;
 
-        err = wmi_install_notify_handler(DELL_EVENT_GUID,
+        status = wmi_install_notify_handler(DELL_EVENT_GUID,
                                          dell_wmi_notify, NULL);
-        if (err) {
+        if (ACPI_FAILURE(status)) {
                 input_unregister_device(dell_wmi_input_dev);
                 printk(KERN_ERR
                         "dell-wmi: Unable to register notify handler - %d\n",
-                        err);
-                return err;
+                        status);
+                return -ENODEV;
         }
 
         return 0;