| From c6a4ea69cba503fe25d52c79d04b5891fdc3fe78 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 4 Apr 2021 10:04:29 +0200 |
| Subject: HID: lenovo: Map mic-mute button to KEY_F20 instead of KEY_MICMUTE |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ Upstream commit 617103246cfd19af837e4cb614ba9f877c4f7779 ] |
| |
| Mapping the mic-mute button to KEY_MICMUTE is technically correct but |
| KEY_MICMUTE translates to a scancode of 256 (248 + 8) under X, |
| which does not fit in 8 bits, so it does not work. |
| |
| Because of this userspace is expecting KEY_F20 instead, |
| theoretically KEY_MICMUTE should work under Wayland but even |
| there it does not work, because the desktop-environment is |
| listening only for KEY_F20 and not for KEY_MICMUTE. |
| |
| Fixes: bc04b37ea0ec ("HID: lenovo: Add ThinkPad 10 Ultrabook Keyboard support") |
| Reviewed-by: Marek Behรบn <kabel@kernel.org> |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hid/hid-lenovo.c | 9 ++++++--- |
| 1 file changed, 6 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c |
| index b2596ed37880..0ff03fed9770 100644 |
| --- a/drivers/hid/hid-lenovo.c |
| +++ b/drivers/hid/hid-lenovo.c |
| @@ -33,6 +33,9 @@ |
| |
| #include "hid-ids.h" |
| |
| +/* Userspace expects F20 for mic-mute KEY_MICMUTE does not work */ |
| +#define LENOVO_KEY_MICMUTE KEY_F20 |
| + |
| struct lenovo_drvdata { |
| u8 led_report[3]; /* Must be first for proper alignment */ |
| int led_state; |
| @@ -134,7 +137,7 @@ static int lenovo_input_mapping_tpkbd(struct hid_device *hdev, |
| if (usage->hid == (HID_UP_BUTTON | 0x0010)) { |
| /* This sub-device contains trackpoint, mark it */ |
| hid_set_drvdata(hdev, (void *)1); |
| - map_key_clear(KEY_MICMUTE); |
| + map_key_clear(LENOVO_KEY_MICMUTE); |
| return 1; |
| } |
| return 0; |
| @@ -149,7 +152,7 @@ static int lenovo_input_mapping_cptkbd(struct hid_device *hdev, |
| (usage->hid & HID_USAGE_PAGE) == HID_UP_LNVENDOR) { |
| switch (usage->hid & HID_USAGE) { |
| case 0x00f1: /* Fn-F4: Mic mute */ |
| - map_key_clear(KEY_MICMUTE); |
| + map_key_clear(LENOVO_KEY_MICMUTE); |
| return 1; |
| case 0x00f2: /* Fn-F5: Brightness down */ |
| map_key_clear(KEY_BRIGHTNESSDOWN); |
| @@ -239,7 +242,7 @@ static int lenovo_input_mapping_tp10_ultrabook_kbd(struct hid_device *hdev, |
| map_key_clear(KEY_FN_ESC); |
| return 1; |
| case 9: /* Fn-F4: Mic mute */ |
| - map_key_clear(KEY_MICMUTE); |
| + map_key_clear(LENOVO_KEY_MICMUTE); |
| return 1; |
| case 10: /* Fn-F7: Control panel */ |
| map_key_clear(KEY_CONFIG); |
| -- |
| 2.30.2 |
| |