Jesse Keating 2f82dda
Date: Mon, 1 Feb 2010 12:53:47 +1300
Jesse Keating 2f82dda
From: Peter Hutterer <peter.hutterer@redhat.com>
Jesse Keating 2f82dda
To: Dave Airlie <airlied@redhat.com>
Jesse Keating 2f82dda
Subject: [PATCH] HID: add multi-input quirk for eGalax Touchcontroller
Jesse Keating 2f82dda
Jesse Keating 2f82dda
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Jesse Keating 2f82dda
Tested-by: Alfred Broda <guaranga@wp.pl>
Jesse Keating 2f82dda
---
Jesse Keating 2f82dda
 drivers/hid/hid-ids.h           |    3 +++
Jesse Keating 2f82dda
 drivers/hid/usbhid/hid-quirks.c |    1 +
Jesse Keating 2f82dda
 2 files changed, 4 insertions(+), 0 deletions(-)
Jesse Keating 2f82dda
Jesse Keating 2f82dda
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
Jesse Keating 2f82dda
index f5144b8..2e698a2 100644
Jesse Keating 2f82dda
--- a/drivers/hid/hid-ids.h
Jesse Keating 2f82dda
+++ b/drivers/hid/hid-ids.h
Jesse Keating 2f82dda
@@ -158,6 +158,9 @@
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
 #define USB_VENDOR_ID_DRAGONRISE	0x0079
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
+#define USB_VENDOR_ID_EGALAX		0x0EEF
Jesse Keating 2f82dda
+#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001
Jesse Keating 2f82dda
+
Jesse Keating 2f82dda
 #define USB_VENDOR_ID_ELO		0x04E7
Jesse Keating 2f82dda
 #define USB_DEVICE_ID_ELO_TS2700	0x0020
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
Jesse Keating 2f82dda
index e987562..dc27d74 100644
Jesse Keating 2f82dda
--- a/drivers/hid/usbhid/hid-quirks.c
Jesse Keating 2f82dda
+++ b/drivers/hid/usbhid/hid-quirks.c
Jesse Keating 2f82dda
@@ -32,6 +32,7 @@ static const struct hid_blacklist {
Jesse Keating 2f82dda
 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
Jesse Keating 2f82dda
 	{ USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
Jesse Keating 2f82dda
 	{ USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
Jesse Keating 2f82dda
+	{ USB_VENDOR_ID_EGALAX, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT },
Jesse Keating 2f82dda
 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
Jesse Keating 2f82dda
 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
Jesse Keating 2f82dda
 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
Jesse Keating 2f82dda
-- 
Jesse Keating 2f82dda
1.6.5.2
Jesse Keating 2f82dda