From: Greg Kroah-Hartman Date: Thu, 30 Nov 2017 14:34:39 +0000 (+0000) Subject: 4.14-stable patches X-Git-Tag: v3.18.86~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c276e3a794a33deea6a8e5493cc88865963c454;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch --- diff --git a/queue-4.14/platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch b/queue-4.14/platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch new file mode 100644 index 00000000000..32ddf888bb4 --- /dev/null +++ b/queue-4.14/platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch @@ -0,0 +1,38 @@ +From 9968e12a291e639dd51d1218b694d440b22a917f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +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 + +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 +Cc: Michel Dänzer +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + 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) diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..e67efbcfa26 --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1 @@ +platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..e69de29bb2d