Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:43 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:45 +0200
commitaa9a4ead9512ac923feb9c6903c48aeea8d106e3 (patch)
treeddcaf449b9b309a9c415ccdd222670671ed46516
parente51cf20725014d92cf0084c833c7a2b7aa1c72bc (diff)
platform/x86: dell-laptop: fix rfkill functionality
-rw-r--r--patches.kernel.org/5.1.3-003-platform-x86-dell-laptop-fix-rfkill-functionali.patch62
-rw-r--r--series.conf1
2 files changed, 63 insertions, 0 deletions
diff --git a/patches.kernel.org/5.1.3-003-platform-x86-dell-laptop-fix-rfkill-functionali.patch b/patches.kernel.org/5.1.3-003-platform-x86-dell-laptop-fix-rfkill-functionali.patch
new file mode 100644
index 0000000000..141848667d
--- /dev/null
+++ b/patches.kernel.org/5.1.3-003-platform-x86-dell-laptop-fix-rfkill-functionali.patch
@@ -0,0 +1,62 @@
+From: Mario Limonciello <mario.limonciello@dell.com>
+Date: Wed, 27 Mar 2019 09:25:34 -0500
+Subject: [PATCH] platform/x86: dell-laptop: fix rfkill functionality
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+References: bnc#1012628
+Patch-mainline: 5.1.3
+Git-commit: 6cc13c28da5beee0f706db6450e190709700b34a
+
+commit 6cc13c28da5beee0f706db6450e190709700b34a upstream.
+
+When converting the driver two arguments were transposed leading
+to rfkill not working.
+
+BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201427
+Reported-by: Pepijn de Vos <pepijndevos@gmail.com>
+Fixes: 549b49 ("platform/x86: dell-smbios: Introduce dispatcher for SMM calls")
+Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
+Acked-by: Pali Rohár <pali.rohar@gmail.com>
+Cc: <stable@vger.kernel.org> # 4.14.x
+Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/platform/x86/dell-laptop.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
+index 95e6ca116e00..a561f653cf13 100644
+--- a/drivers/platform/x86/dell-laptop.c
++++ b/drivers/platform/x86/dell-laptop.c
+@@ -531,7 +531,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
+ return;
+ }
+
+- dell_fill_request(&buffer, 0, 0x2, 0, 0);
++ dell_fill_request(&buffer, 0x2, 0, 0, 0);
+ ret = dell_send_request(&buffer, CLASS_INFO, SELECT_RFKILL);
+ hwswitch = buffer.output[1];
+
+@@ -562,7 +562,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data)
+ return ret;
+ status = buffer.output[1];
+
+- dell_fill_request(&buffer, 0, 0x2, 0, 0);
++ dell_fill_request(&buffer, 0x2, 0, 0, 0);
+ hwswitch_ret = dell_send_request(&buffer, CLASS_INFO, SELECT_RFKILL);
+ if (hwswitch_ret)
+ return hwswitch_ret;
+@@ -647,7 +647,7 @@ static void dell_update_rfkill(struct work_struct *ignored)
+ if (ret != 0)
+ return;
+
+- dell_fill_request(&buffer, 0, 0x2, 0, 0);
++ dell_fill_request(&buffer, 0x2, 0, 0, 0);
+ ret = dell_send_request(&buffer, CLASS_INFO, SELECT_RFKILL);
+
+ if (ret == 0 && (status & BIT(0)))
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index 298415a750..0ff2819e22 100644
--- a/series.conf
+++ b/series.conf
@@ -88,6 +88,7 @@
patches.kernel.org/5.1.2-028-Linux-5.1.2.patch
patches.kernel.org/5.1.3-001-platform-x86-sony-laptop-Fix-unintentional-fall.patch
patches.kernel.org/5.1.3-002-platform-x86-thinkpad_acpi-Disable-Bluetooth-fo.patch
+ patches.kernel.org/5.1.3-003-platform-x86-dell-laptop-fix-rfkill-functionali.patch
########################################################
# Build fixes that apply to the vanilla kernel too.