projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
platform
/
x86
/
hp-wmi.c
diff --git
a/drivers/platform/x86/hp-wmi.c
b/drivers/platform/x86/hp-wmi.c
index fb4dd7b3ee711f9ba9b42b4384331c1df9e32fc0..af2046c87806561b351a21201a63753c601c192d 100644
(file)
--- 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;
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,
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;
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);
hp_wmi_rfkill2_setup(device);
err = device_create_file(&device->dev, &dev_attr_display);