Skip to content

Commit

Permalink
hp-wmi: Fix wifi cannot be hard-unblocked
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Hung authored and Darren Hart committed Jun 29, 2016
1 parent 95d16d8 commit fc8a601
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/platform/x86/hp-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,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,
Expand Down Expand Up @@ -882,7 +887,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
wwan_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);
Expand Down

0 comments on commit fc8a601

Please sign in to comment.