5 files changed, 38 insertions, 16 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index b26e3019e1cc..57570ac47803 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -609,7 +609,8 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
         status = acpi_evaluate_object(handle, "_EJD", NULL, &buffer);
         if (ACPI_SUCCESS(status)) {
                 obj = buffer.pointer;
-                status = acpi_get_handle(NULL, obj->string.pointer, ejd);
+                status = acpi_get_handle(ACPI_ROOT_OBJECT, obj->string.pointer,
+                                         ejd);
                 kfree(buffer.pointer);
         }
         return status;
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);
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 982e27b86d10..962817e49fba 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -108,6 +108,7 @@ config ACER_WMI
         depends on ACPI
         depends on LEDS_CLASS
         depends on BACKLIGHT_CLASS_DEVICE
+        depends on SERIO_I8042
         select ACPI_WMI
         ---help---
           This is a driver for newer Acer (and Wistron) laptops. It adds
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index cf71e312b5cb..dd13a3749927 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -219,6 +219,15 @@ static struct dmi_system_id acer_quirks[] = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer Aspire 3610",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3610"),
+                },
+                .driver_data = &quirk_acer_travelmate_2490,
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Acer Aspire 5100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -228,6 +237,15 @@ static struct dmi_system_id acer_quirks[] = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer Aspire 5610",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+                },
+                .driver_data = &quirk_acer_travelmate_2490,
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Acer Aspire 5630",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -761,7 +779,7 @@ enum led_brightness value)
 }
 
 static struct led_classdev mail_led = {
-        .name = "acer-mail:green",
+        .name = "acer-wmi::mail",
         .brightness_set = mail_led_set,
 };
 
@@ -1052,11 +1070,12 @@ static int __init acer_wmi_init(void)
 
         if (wmi_has_guid(WMID_GUID2) && interface) {
                 if (ACPI_FAILURE(WMID_set_capabilities())) {
-                        printk(ACER_ERR "Unable to detect available devices\n");
+                        printk(ACER_ERR "Unable to detect available WMID "
+                                        "devices\n");
                         return -ENODEV;
                 }
         } else if (!wmi_has_guid(WMID_GUID2) && interface) {
-                printk(ACER_ERR "Unable to detect available devices\n");
+                printk(ACER_ERR "No WMID device detection method found\n");
                 return -ENODEV;
         }
 
@@ -1064,21 +1083,20 @@ static int __init acer_wmi_init(void)
                 interface = &AMW0_interface;
 
                 if (ACPI_FAILURE(AMW0_set_capabilities())) {
-                        printk(ACER_ERR "Unable to detect available devices\n");
+                        printk(ACER_ERR "Unable to detect available AMW0 "
+                                        "devices\n");
                         return -ENODEV;
                 }
         }
 
-        if (wmi_has_guid(AMW0_GUID1)) {
-                if (ACPI_FAILURE(AMW0_find_mailled()))
-                        printk(ACER_ERR "Unable to detect mail LED\n");
-        }
+        if (wmi_has_guid(AMW0_GUID1))
+                AMW0_find_mailled();
 
         find_quirks();
 
         if (!interface) {
-                printk(ACER_ERR "No or unsupported WMI interface, unable to ");
-                printk(KERN_CONT "load.\n");
+                printk(ACER_ERR "No or unsupported WMI interface, unable to "
+                                "load\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 899e3f75f288..02ff3d19b1cc 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -315,7 +315,7 @@ static void sony_laptop_report_input_event(u8 event)
                 break;
 
         default:
-                if (event > ARRAY_SIZE(sony_laptop_input_index)) {
+                if (event >= ARRAY_SIZE(sony_laptop_input_index)) {
                         dprintk("sony_laptop_report_input_event, event not known: %d\n", event);
                         break;
                 }