--- /dev/null
+From 9968e12a291e639dd51d1218b694d440b22a917f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Fri, 3 Nov 2017 03:01:53 +0100
+Subject: platform/x86: hp-wmi: Fix tablet mode detection for convertibles
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/platform/x86/hp-wmi.c
++++ b/drivers/platform/x86/hp-wmi.c
+@@ -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)