From patchwork Tue Oct 12 19:02:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Jaouen?= X-Patchwork-Id: 248841 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 o9CJ2muK031738 for ; Tue, 12 Oct 2010 19:02:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758039Ab0JLTCq (ORCPT ); Tue, 12 Oct 2010 15:02:46 -0400 Received: from smtp28.orange.fr ([80.12.242.100]:7701 "EHLO smtp28.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758055Ab0JLTCq (ORCPT ); Tue, 12 Oct 2010 15:02:46 -0400 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2809.orange.fr (SMTP Server) with ESMTP id 1D6C97000ECA; Tue, 12 Oct 2010 21:02:44 +0200 (CEST) Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2809.orange.fr (SMTP Server) with ESMTP id 0FB7770012D4; Tue, 12 Oct 2010 21:02:44 +0200 (CEST) Received: from [192.168.246.4] (AVelizy-155-1-1-39.w83-199.abo.wanadoo.fr [83.199.40.39]) by mwinf2809.orange.fr (SMTP Server) with ESMTP id A0EFC7000ECA; Tue, 12 Oct 2010 21:02:43 +0200 (CEST) X-ME-UUID: 20101012190243659.A0EFC7000ECA@mwinf2809.orange.fr Message-ID: <4CB4B0D3.5010104@laposte.net> Date: Tue, 12 Oct 2010 21:02:43 +0200 From: =?UTF-8?B?RnJhbsOnb2lzIEphb3Vlbg==?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc13 Lightning/1.0b3pre Thunderbird/3.1.4 MIME-Version: 1.0 To: Jiri Kosina CC: linux-input@vger.kernel.org, "francois.jaouen@softeam.fr" Subject: Re: [PATCH] Add Cando touch screen 15.6-inch product id with Signed-off-by References: <1286642783.5459.36.camel@francois-laptop> <1286697999.1643.4.camel@francois-laptop> In-Reply-To: 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, 12 Oct 2010 19:02:49 +0000 (UTC) diff --git a/drivers/hid/hid-cando.c b/drivers/hid/hid-cando.c index 4267a6f..ab231cd 100644 --- a/drivers/hid/hid-cando.c +++ b/drivers/hid/hid-cando.c @@ -237,6 +237,8 @@ static const struct hid_device_id cando_devices[] = { USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, + USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, { } }; MODULE_DEVICE_TABLE(hid, cando_devices); diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 3f72924..a0dea3d 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1292,6 +1292,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 765a4f5..3d46d9f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -133,7 +133,8 @@ #define USB_VENDOR_ID_CANDO 0x2087 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01 -#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 +#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03 +#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01 #define USB_VENDOR_ID_CH 0x068e #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2