platform/x86: hp-wmi: Fix detection for dock and tablet mode

commit 298747b7579f5bbbced793d997b333fd10a24921 upstream.

The current driver code is not checking for the error values returned by
'hp_wmi_dock_state()' and 'hp_wmi_tablet_state()' before passing the
returned values down to 'input_report_switch()'. This error code is
being translated to '1' in the input subsystem, reporting the wrong
status.

The biggest problem caused by this issue is that several laptops are
wrongly reported by the driver as docked, preventing them to be put to
sleep using the LID (and in most cases they are not even dockable).

With this patch we create the report switches only if we are able to
read the dock and tablet mode status correctly from ACPI.

Signed-off-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Cc: Philip Müller <philm@manjaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index af2046c87806561b351a21201a63753c601c192d..056a671165d10de63ee488e0260b1f0e84213b95 100644 (file)
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -573,10 +573,12 @@ static void hp_wmi_notify(u32 value, void *context)
 
        switch (event_id) {
        case HPWMI_DOCK_EVENT:
-               input_report_switch(hp_wmi_input_dev, SW_DOCK,
-                                   hp_wmi_dock_state());
-               input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
-                                   hp_wmi_tablet_state());
+               if (test_bit(SW_DOCK, hp_wmi_input_dev->swbit))
+                       input_report_switch(hp_wmi_input_dev, SW_DOCK,
+                                           hp_wmi_dock_state());
+               if (test_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit))
+                       input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
+                                           hp_wmi_tablet_state());
                input_sync(hp_wmi_input_dev);
                break;
        case HPWMI_PARK_HDD:
@@ -649,6 +651,7 @@ static int __init hp_wmi_input_setup(void)
 {
        acpi_status status;
        int err;
+       int val;
 
        hp_wmi_input_dev = input_allocate_device();
        if (!hp_wmi_input_dev)
@@ -659,17 +662,26 @@ static int __init hp_wmi_input_setup(void)
        hp_wmi_input_dev->id.bustype = BUS_HOST;
 
        __set_bit(EV_SW, hp_wmi_input_dev->evbit);
-       __set_bit(SW_DOCK, hp_wmi_input_dev->swbit);
-       __set_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit);
+
+       /* Dock */
+       val = hp_wmi_dock_state();
+       if (!(val < 0)) {
+               __set_bit(SW_DOCK, hp_wmi_input_dev->swbit);
+               input_report_switch(hp_wmi_input_dev, SW_DOCK, val);
+       }
+
+       /* Tablet mode */
+       val = hp_wmi_tablet_state();
+       if (!(val < 0)) {
+               __set_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit);
+               input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE, val);
+       }
 
        err = sparse_keymap_setup(hp_wmi_input_dev, hp_wmi_keymap, NULL);
        if (err)
                goto err_free_dev;
 
        /* Set initial hardware state */
-       input_report_switch(hp_wmi_input_dev, SW_DOCK, hp_wmi_dock_state());
-       input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
-                           hp_wmi_tablet_state());
        input_sync(hp_wmi_input_dev);
 
        if (!hp_wmi_bios_2009_later() && hp_wmi_bios_2008_later())
@@ -982,10 +994,12 @@ static int hp_wmi_resume_handler(struct device *device)
         * changed.
         */
        if (hp_wmi_input_dev) {
-               input_report_switch(hp_wmi_input_dev, SW_DOCK,
-                                   hp_wmi_dock_state());
-               input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
-                                   hp_wmi_tablet_state());
+               if (test_bit(SW_DOCK, hp_wmi_input_dev->swbit))
+                       input_report_switch(hp_wmi_input_dev, SW_DOCK,
+                                           hp_wmi_dock_state());
+               if (test_bit(SW_TABLET_MODE, hp_wmi_input_dev->swbit))
+                       input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
+                                           hp_wmi_tablet_state());
                input_sync(hp_wmi_input_dev);
        }