]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
HID: multitouch: Support HID_GD_WIRELESS_RADIO_CTLS
authorJoão Paulo Rechi Vita <jprvita@gmail.com>
Mon, 24 Jul 2017 21:22:24 +0000 (14:22 -0700)
committerJiri Kosina <jkosina@suse.cz>
Thu, 3 Aug 2017 09:20:17 +0000 (11:20 +0200)
Some keyboard + touchpad devices have the Microsoft Win8 Wireless Radio
Controls extensions Usage Page define in the touchpad report descriptor,
so we need to support them in this driver.

Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-multitouch.c

index aff20f4b6d97ead09453b303eaf4ac3ac94e1628..152d33120a55d5f1a48ada1da96c34f7d566c894 100644 (file)
@@ -922,7 +922,8 @@ 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_CP_CONSUMER_CONTROL)
+           field->application != HID_CP_CONSUMER_CONTROL &&
+           field->application != HID_GD_WIRELESS_RADIO_CTLS)
                return -1;
 
        /*
@@ -1133,6 +1134,9 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
                case HID_CP_CONSUMER_CONTROL:
                        suffix = "Consumer Control";
                        break;
+               case HID_GD_WIRELESS_RADIO_CTLS:
+                       suffix = "Wireless Radio Control";
+                       break;
                default:
                        suffix = "UNKNOWN";
                        break;