From patchwork Fri Dec 17 12:03:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 415591 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 oBHC4AFU027212 for ; Fri, 17 Dec 2010 12:04:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331Ab0LQMDy (ORCPT ); Fri, 17 Dec 2010 07:03:54 -0500 Received: from ch-smtp03.sth.basefarm.net ([80.76.149.214]:38552 "EHLO ch-smtp03.sth.basefarm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753312Ab0LQMDx (ORCPT ); Fri, 17 Dec 2010 07:03:53 -0500 Received: from c83-248-200-95.bredband.comhem.se ([83.248.200.95]:36720 helo=polaris) by ch-smtp03.sth.basefarm.net with smtp (Exim 4.72) (envelope-from ) id 1PTZ21-0005Wx-Bb; Fri, 17 Dec 2010 13:03:33 +0100 Received: by polaris (sSMTP sendmail emulation); Fri, 17 Dec 2010 13:03:22 +0100 From: "Henrik Rydberg" Date: Fri, 17 Dec 2010 13:03:22 +0100 To: Andy Ross Cc: Dmitry Torokhov , Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] WeTab device ID Message-ID: <20101217120322.GA3873@polaris> References: <4D0AA66F.6080506@plausible.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4D0AA66F.6080506@plausible.org> User-Agent: Mutt/1.5.20 (2009-06-14) X-Originating-IP: 83.248.200.95 X-Header-Warning: Invalid syntax in message headers: X-Scan-Result: No virus found in message 1PTZ21-0005Wx-Bb. X-Scan-Signature: ch-smtp03.sth.basefarm.net 1PTZ21-0005Wx-Bb ed336397779d056cd0174381acfd253b 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]); Fri, 17 Dec 2010 12:04:10 +0000 (UTC) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index f4a37f8..88668ae 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1302,6 +1302,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) }, { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) }, diff --git a/drivers/hid/hid-egalax.c b/drivers/hid/hid-egalax.c index 8787850..16566fc 100644 --- a/drivers/hid/hid-egalax.c +++ b/drivers/hid/hid-egalax.c @@ -242,6 +242,8 @@ static const struct hid_device_id egalax_devices[] = { USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) }, { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, + USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) }, { } }; MODULE_DEVICE_TABLE(hid, egalax_devices); diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index a95719b..0f150c7 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -198,6 +198,7 @@ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061