summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-04-02 09:57:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-08 07:21:49 +0200
commit7ce0b428c0463616b478e8cdeb9e67551105c799 (patch)
treed48b37887fddc0edd1d1818e5588fed91c6aeeaa /drivers
parentce9e2dc03f63e0101d3771da32e4d3ea4378b104 (diff)
downloadlinux-stable-7ce0b428c0463616b478e8cdeb9e67551105c799.tar.gz
linux-stable-7ce0b428c0463616b478e8cdeb9e67551105c799.tar.bz2
linux-stable-7ce0b428c0463616b478e8cdeb9e67551105c799.zip
HID: input: add mapping for Assistant key
[ Upstream commit ce856634af8cda3490947df8ac1ef5843e6356af ] According to HUTRR89 usage 0x1cb from the consumer page was assigned to allow launching desktop-aware assistant application, so let's add the mapping. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-input.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index a3916e58dbf5..e649940e065d 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -982,6 +982,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
case 0x1b8: map_key_clear(KEY_VIDEO); break;
case 0x1bc: map_key_clear(KEY_MESSENGER); break;
case 0x1bd: map_key_clear(KEY_INFO); break;
+ case 0x1cb: map_key_clear(KEY_ASSISTANT); break;
case 0x201: map_key_clear(KEY_NEW); break;
case 0x202: map_key_clear(KEY_OPEN); break;
case 0x203: map_key_clear(KEY_CLOSE); break;