summaryrefslogtreecommitdiffstats
path: root/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-06-15 14:11:15 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-06-15 15:56:26 -0700
commit9f800a78eb0bef7f32399364f63701a26b074a8c (patch)
treedfa0764bc642b4a7a607858cce6b4d093c54c831 /hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
parent83d855a219f9813a263a117fc7bc695559101972 (diff)
downloadkernel-9f800a78eb0bef7f32399364f63701a26b074a8c.tar.gz
kernel-9f800a78eb0bef7f32399364f63701a26b074a8c.tar.xz
kernel-9f800a78eb0bef7f32399364f63701a26b074a8c.zip
hp-wmi: fix wifi cannot be hard-unblock (rhbz 1338025)
Diffstat (limited to 'hp-wmi-fix-wifi-cannot-be-hard-unblock.patch')
-rw-r--r--hp-wmi-fix-wifi-cannot-be-hard-unblock.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch b/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
new file mode 100644
index 000000000..51ccc8c48
--- /dev/null
+++ b/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
@@ -0,0 +1,44 @@
+From 97345b0e9b02d6d794fc772e366efe6e44b9340a Mon Sep 17 00:00:00 2001
+From: Alex Hung <alex.hung@canonical.com>
+Date: Mon, 13 Jun 2016 19:44:00 +0800
+Subject: [PATCH] hp-wmi: fix wifi cannot be hard-unblock
+
+Several users reported wifi cannot be unblocked as discussed in [1].
+This patch removes the useof 2009 flag by BIOS but uses the actual WMI
+function calls - it will be skipped if WMI reports unsupported
+
+[1] https://bugzilla.kernel.org/show_bug.cgi?id=69131
+
+Signed-off-by: Alex Hung <alex.hung@canonical.com>
+---
+ drivers/platform/x86/hp-wmi.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
+index fb4dd7b..af2046c 100644
+--- a/drivers/platform/x86/hp-wmi.c
++++ b/drivers/platform/x86/hp-wmi.c
+@@ -723,6 +723,11 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device)
+ if (err)
+ return err;
+
++ err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, &wireless,
++ sizeof(wireless), 0);
++ if (err)
++ return err;
++
+ if (wireless & 0x1) {
+ wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
+ RFKILL_TYPE_WLAN,
+@@ -910,7 +915,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
+ gps_rfkill = NULL;
+ rfkill2_count = 0;
+
+- if (hp_wmi_bios_2009_later() || hp_wmi_rfkill_setup(device))
++ if (hp_wmi_rfkill_setup(device))
+ hp_wmi_rfkill2_setup(device);
+
+ err = device_create_file(&device->dev, &dev_attr_display);
+--
+2.5.5
+