From patchwork Fri Nov 23 15:31:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1796131 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0FFAB3FC54 for ; Fri, 23 Nov 2012 15:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748Ab2KWPcf (ORCPT ); Fri, 23 Nov 2012 10:32:35 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:60142 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753654Ab2KWPcA (ORCPT ); Fri, 23 Nov 2012 10:32:00 -0500 Received: by mail-wi0-f178.google.com with SMTP id hm6so1711659wib.1 for ; Fri, 23 Nov 2012 07:31:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=XfgGiOaVM+z8Xt51BYW18Ub1IIfKOBw+lCGeffwZV0M=; b=Aszagrx6w9m0TeONe9a8u5h5+po4wz2MNQqyEjm52Aqc5irm7fOoE9GRHQpnLLPI4B iQiNanQb2beYMJeIdbKUDRMvoNabmSEuyjii9jCLWgAfP8mG2taKNDuZBylRmleRywda ls2kWacnELupeUKBda0k7IWWwUDSMnjS6S33pzijZ8rb7bDUVSmfB0CX8ssYrkP5U2bk 6yd0TsDvAEiV26OxMtUGfVxmadO/B/uCKb/BnW7Rcyt2YYoZrEnu5dSOIYBJZJnhjPOe hMOE6PLr7deSPOOX7vWPx2sgWeAf74DKEbcCKaXuHUjrW6oGPBecyeCp1BKZDwwfTVad +ZUQ== Received: by 10.216.45.135 with SMTP id p7mr1792536web.129.1353684719174; Fri, 23 Nov 2012 07:31:59 -0800 (PST) Received: from localhost.localdomain.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id y3sm8996809wix.6.2012.11.23.07.31.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 07:31:58 -0800 (PST) From: Benjamin Tissoires To: Benjamin Tissoires , Dmitry Torokhov , Henrik Rydberg , Jiri Kosina , Stephane Chatty , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] HID: hid-multitouch: fix protocol for 3 devices Date: Fri, 23 Nov 2012 16:31:33 +0100 Message-Id: <1353684694-5723-11-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353684694-5723-1-git-send-email-benjamin.tissoires@gmail.com> References: <1353684694-5723-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Cando 2087:0a02 was broken, this fixes it. ActionStar and LG panels can be optimized by using the new default class. Signed-off-by: Benjamin Tissoires --- drivers/hid/hid-multitouch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 5e0a4d7..b374a5a 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -997,7 +997,7 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_3M3266) }, /* ActionStar panels */ - { .driver_data = MT_CLS_NSMU, + { .driver_data = MT_CLS_DEFAULT, MT_USB_DEVICE(USB_VENDOR_ID_ACTIONSTAR, USB_DEVICE_ID_ACTIONSTAR_1011) }, @@ -1017,7 +1017,7 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, MT_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) }, - { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, + { .driver_data = MT_CLS_DEFAULT, MT_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_10_1) }, { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER, @@ -1155,7 +1155,7 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, /* LG Display panels */ - { .driver_data = MT_CLS_NSMU, + { .driver_data = MT_CLS_DEFAULT, MT_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) },