summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2017-08-22 08:37:52 +0200
committerJiri Kosina <jkosina@suse.cz>2017-09-06 10:53:57 +0200
commite57f4e67a0c73ca1c3afb68928b917906bd82eaf (patch)
tree4f782ce97998fac0eae1006849fb61aca659b670
parenta3ae552b5259e6ffd8d124a9fa9923283af2828a (diff)
downloadlinux-e57f4e67a0c73ca1c3afb68928b917906bd82eaf.tar.gz
linux-e57f4e67a0c73ca1c3afb68928b917906bd82eaf.tar.bz2
linux-e57f4e67a0c73ca1c3afb68928b917906bd82eaf.zip
HID: multitouch: Fix system-control buttons not working
Some laptops have system-control buttons (e.g. KEY_SLEEP) on the same interface as a hid-multitouch touch-pad. This commit fixes these buttons not working. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-multitouch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 440b999304a5..5609725df714 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -930,6 +930,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
field->application != HID_DG_PEN &&
field->application != HID_DG_TOUCHPAD &&
field->application != HID_GD_KEYBOARD &&
+ field->application != HID_GD_SYSTEM_CONTROL &&
field->application != HID_CP_CONSUMER_CONTROL &&
field->application != HID_GD_WIRELESS_RADIO_CTLS &&
!(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&