diff options
| author | Gabriele Mazzotta <gabriele.mzt@gmail.com> | 2014-12-04 00:16:21 +0100 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-12-03 19:10:16 +0100 |
| commit | 8f8d75ebf075001485d787a4429ba15b1dd8dd7a (patch) | |
| tree | a0f69baf42f9db9a07e7b6d8a9175cfe894748da /drivers/platform | |
| parent | hp_wireless: Inform the user if hp_wireless_input_setup()/add() fails (diff) | |
| download | linux-8f8d75ebf075001485d787a4429ba15b1dd8dd7a.tar.xz linux-8f8d75ebf075001485d787a4429ba15b1dd8dd7a.zip | |
dell-wmi: Don't report keypresses for radio state changes
The WMI events associated to KEY_WLAN are for all the radio devices
available. Use KEY_RFKILL instead since it's more appropriate.
The state of radio devices is changed directly by the BIOS when hotkeys
are pressed, so no events should be reported.
Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Merged two patches modifying this one line
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/dell-wmi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index e2b6a642b3c5..4c2a44da2fff 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -65,10 +65,8 @@ static const struct key_entry dell_wmi_legacy_keymap[] __initconst = { /* Battery health status button */ { KE_KEY, 0xe007, { KEY_BATTERY } }, - /* This is actually for all radios. Although physically a - * switch, the notification does not provide an indication of - * state and so it should be reported as a key */ - { KE_KEY, 0xe008, { KEY_WLAN } }, + /* Radio devices state change */ + { KE_IGNORE, 0xe008, { KEY_RFKILL } }, /* The next device is at offset 6, the active devices are at offset 8 and the attached devices at offset 10 */ |