From 35cd3367e5ff38b39f8f567f614720f0233a23a8 Mon Sep 17 00:00:00 2001 From: Forest Bond Date: Tue, 6 Nov 2012 13:41:22 -0500 Subject: [PATCH] --- yaml --- r: 343107 b: refs/heads/master c: 729b814acec20db66fc891b5392cb653ad6598ef h: refs/heads/master i: 343105: fe917e2f4c829962090cdb9bcc83079c0c5f46a9 343103: 78a23cc7fde58b3761cb720e1a92c601832c9e3b v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 11 ++++++++++- trunk/drivers/hid/hid-ids.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3eec2d3dbf52..4d9dfd9799ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 537b6643dcb0ff7f47b21debd7bc3346b1456a44 +refs/heads/master: 729b814acec20db66fc891b5392cb653ad6598ef diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index 0a6b36fbb4ce..a7550bb30836 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -2183,7 +2183,16 @@ static bool hid_ignore(struct hid_device *hdev) if (hdev->product == USB_DEVICE_ID_JESS_YUREX && hdev->type == HID_TYPE_USBNONE) return true; - break; + break; + case USB_VENDOR_ID_DWAV: + /* These are handled by usbtouchscreen. hdev->type is probably + * HID_TYPE_USBNONE, but we say !HID_TYPE_USBMOUSE to match + * usbtouchscreen. */ + if ((hdev->product == USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER || + hdev->product == USB_DEVICE_ID_DWAV_TOUCHCONTROLLER) && + hdev->type != HID_TYPE_USBMOUSE) + return true; + break; } if (hdev->type == HID_TYPE_USBMOUSE && diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index 9bc8d570777a..6a971477535c 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -254,6 +254,7 @@ #define USB_VENDOR_ID_DWAV 0x0eef #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 +#define USB_DEVICE_ID_DWAV_TOUCHCONTROLLER 0x0002 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207