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 <[email protected]>
Merged two patches modifying this one line
Signed-off-by: Darren Hart <[email protected]>

diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index e2b6a642b3c5bd13c576931d8727f8917a9cbf9a..4c2a44da2fff14897e6db444cc1bbf5eef1ab924 100644 (file)
--- 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 */