HID: add vivaldi HID driver

[sfrench/cifs-2.6.git] / drivers / hid / hid-core.c

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index d2ecc9c4525548c5ae4f1f1a54de70d61c52a91d..6dbd09254c44e9b99c39e859a0b34a9099cc3f10 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -814,6 +814,13 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
 
        if ((parser->global.usage_page << 16) >= HID_UP_MSVENDOR)
                parser->scan_flags |= HID_SCAN_FLAG_VENDOR_SPECIFIC;
+
+       if ((parser->global.usage_page << 16) == HID_UP_GOOGLEVENDOR)
+               for (i = 0; i < parser->local.usage_index; i++)
+                       if (parser->local.usage[i] ==
+                                       (HID_UP_GOOGLEVENDOR | 0x0001))
+                               parser->device->group =
+                                       HID_GROUP_VIVALDI;
 }
 
 static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)