diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-06-15 14:11:15 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-06-15 14:21:01 -0700 |
| commit | 57e9b402600b79c15f3b8d63a80ee3ceaa1ff2bd (patch) | |
| tree | 416713b7e1affc582ba303256429813f3c44bfd0 | |
| parent | e5e1555ce19175b8115e9f082e48c83cc09458c1 (diff) | |
| download | kernel-57e9b402600b79c15f3b8d63a80ee3ceaa1ff2bd.tar.gz kernel-57e9b402600b79c15f3b8d63a80ee3ceaa1ff2bd.tar.xz kernel-57e9b402600b79c15f3b8d63a80ee3ceaa1ff2bd.zip | |
hp-wmi: fix wifi cannot be hard-unblock (rhbz 1338025)
| -rw-r--r-- | hp-wmi-fix-wifi-cannot-be-hard-unblock.patch | 44 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 50 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 + diff --git a/kernel.spec b/kernel.spec index 6f8ca675a..970981484 100644 --- a/kernel.spec +++ b/kernel.spec @@ -667,6 +667,9 @@ Patch726: sched-panic-on-corrupted-stack-end.patch #CVE-2016-4470 rhbz 1341716 1346626 Patch727: KEYS-potential-uninitialized-variable.patch +#rhbz 1338025 +Patch728: hp-wmi-fix-wifi-cannot-be-hard-unblock.patch + # END OF PATCH DEFINITIONS %endif @@ -2184,6 +2187,9 @@ fi # # %changelog +* Wed Jun 15 2016 Laura Abbott <labbott@fedoraproject.org> +- hp-wmi: fix wifi cannot be hard-unblock (rhbz 1338025) + * Wed Jun 15 2016 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626) |