dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should follo...
authorLen Brown <len.brown@intel.com>
Wed, 30 Dec 2009 06:21:42 +0000 (01:21 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 20:42:53 +0000 (12:42 -0800)
wmi_install_notify_handler() returns an acpi_error,
but dell_wmi_init() needs return a -errno style error.

Signed-off-by: Len Brown <len.brown@intel.com>
Tested-by: Paul Rolland <rol@as2917.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/platform/x86/dell-wmi.c

index 916ccb2b316c5b87c92d576a5bb6906f49891082..4c7e70299d6b541f169a4b5d1adeabfdca475ab8 100644 (file)
@@ -323,6 +323,7 @@ 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)) {
                printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
@@ -336,14 +337,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;