OSDN Git Service

platform/x86: hp-wmi: Fix tablet mode detection for convertibles
authorStefan Brüns <stefan.bruens@rwth-aachen.de>
Fri, 3 Nov 2017 02:01:53 +0000 (03:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Dec 2017 10:26:27 +0000 (11:26 +0100)
commit 9968e12a291e639dd51d1218b694d440b22a917f upstream.

Commit f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet
state fetchers") consolidated the methods for docking and laptop mode
detection, but omitted to apply the correct mask for the laptop mode
(it always uses the constant for docking).

Fixes: f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet state fetchers")
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Cc: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/platform/x86/hp-wmi.c

index b4ed3dc..b422438 100644 (file)
@@ -297,7 +297,7 @@ static int hp_wmi_hw_state(int mask)
        if (state < 0)
                return state;
 
-       return state & 0x1;
+       return !!(state & mask);
 }
 
 static int __init hp_wmi_bios_2008_later(void)