]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 14:34:39 +0000 (14:34 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 14:34:39 +0000 (14:34 +0000)
added patches:
platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch

queue-4.14/platform-x86-hp-wmi-fix-tablet-mode-detection-for-convertibles.patch [new file with mode: 0644]
queue-4.14/series [new file with mode: 0644]
queue-4.9/series [new file with mode: 0644]

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 (file)
index 0000000..32ddf88
--- /dev/null
@@ -0,0 +1,38 @@
+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)
diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..e67efbc
--- /dev/null
@@ -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 (file)
index 0000000..e69de29