From patchwork Tue Dec 21 10:55:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 424241 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBLAtjDT014416 for ; Tue, 21 Dec 2010 10:55:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751124Ab0LUKzo (ORCPT ); Tue, 21 Dec 2010 05:55:44 -0500 Received: from smtp4-g21.free.fr ([212.27.42.4]:44326 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114Ab0LUKzn (ORCPT ); Tue, 21 Dec 2010 05:55:43 -0500 Received: from substantiel.fr (unknown [82.225.147.143]) by smtp4-g21.free.fr (Postfix) with SMTP id D6D8D4C8180; Tue, 21 Dec 2010 11:55:36 +0100 (CET) Received: (nullmailer pid 31395 invoked by uid 0); Tue, 21 Dec 2010 10:55:35 -0000 From: Anisse Astier To: linux-input@vger.kernel.org Cc: Jiri Kosina , Anisse Astier Subject: [PATCH] HID: Add MULTI_INPUT quirk for another D-WAV touchscreen Date: Tue, 21 Dec 2010 11:55:18 +0100 Message-Id: <1292928918-31264-1-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.7.3.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 10:55:45 +0000 (UTC) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3341baa..b76166a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -196,6 +196,7 @@ #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 2c18547..52ceeda 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -34,6 +34,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET }, + { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },