Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8a601e authored by Alex Hung's avatar Alex Hung Committed by Darren Hart
Browse files

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: default avatarAlex Hung <alex.hung@canonical.com>
Tested-by: default avatarEvgenii Shatokhin <eugene.shatokhin@yandex.ru>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
parent 95d16d81

drivers/platform/x86/hp-wmi.c

+6 −1
Original line number Diff line number Diff line
@@ -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,
@@ -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);