瀏覽代碼

hp-wmi: Fix wifi cannot be hard-unblocked

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>
Cc: stable@vger.kernel.org
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Alex Hung 9 年之前
父節點
當前提交
fc8a601e11
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      drivers/platform/x86/hp-wmi.c

+ 6 - 1
drivers/platform/x86/hp-wmi.c

@@ -718,6 +718,11 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device)
 	if (err)
 	if (err)
 		return err;
 		return err;
 
 
+	err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, &wireless,
+				   sizeof(wireless), 0);
+	if (err)
+		return err;
+
 	if (wireless & 0x1) {
 	if (wireless & 0x1) {
 		wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
 		wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
 					   RFKILL_TYPE_WLAN,
 					   RFKILL_TYPE_WLAN,
@@ -882,7 +887,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
 	wwan_rfkill = NULL;
 	wwan_rfkill = NULL;
 	rfkill2_count = 0;
 	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);
 		hp_wmi_rfkill2_setup(device);
 
 
 	err = device_create_file(&device->dev, &dev_attr_display);
 	err = device_create_file(&device->dev, &dev_attr_display);