aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Hung <alex.hung@canonical.com>2016-06-13 19:44:00 +0800
committerWilly Tarreau <w@1wt.eu>2016-08-27 11:40:36 +0200
commit21fc94d75e5e5241ceff5ec8182db1d40d5ccc05 (patch)
treeae24bc7abc5062f9056774d7e1096a4bde1820b8
parent68a444857c7965327f3a4ad79c0b0ddee4de2915 (diff)
downloadlinux-stable-rt-21fc94d75e5e5241ceff5ec8182db1d40d5ccc05.tar.gz
hp-wmi: Fix wifi cannot be hard-unblocked
commit fc8a601e1175ae351f662506030f9939cb7fdbfe upstream. Several users reported wifi cannot be unblocked as discussed in [1]. This patch removes the use of the 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> Tested-by: Evgenii Shatokhin <eugene.shatokhin@yandex.ru> Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/platform/x86/hp-wmi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index d111c8687f9bd2..46497c6cbcc179 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -640,6 +640,11 @@ static int 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,