From patchwork Mon Dec 3 23:56:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Calleja X-Patchwork-Id: 1835751 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 5FC4D40E3F for ; Mon, 3 Dec 2012 23:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751306Ab2LCX7e (ORCPT ); Mon, 3 Dec 2012 18:59:34 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:50585 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211Ab2LCX7e (ORCPT ); Mon, 3 Dec 2012 18:59:34 -0500 Received: by mail-we0-f174.google.com with SMTP id x10so1308609wey.19 for ; Mon, 03 Dec 2012 15:59:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:user-agent:mime-version :content-transfer-encoding:content-type; bh=BcxUVx0bCCWXohBRsef+b3p1SMKLJXbZLNKJo8JoPpw=; b=eEWbwFaFU/Und9FWVbDZyVG+pLb4G/C7tmw7vg4UdKI4Ooa6EB5cbXjQpHiUxLKZKM QZ0oZ42h0L0+Ulc5rIWeyCTFOLpoq9DSzFzUuMCNvR+G78ssLsKNy2CN4MlIzxakT/tL hCZ/S80XLDtYUjn/Xal+iLUEsRknDebiOCOWH1bAihROdkixz4y+xfRYQuwybv2N3fBv xLMD2Y2dXmLjfZPwelG1NSbrWaOVT/ie/qExs8Ca+nJDMrJtZF2ywFjgme8/r8oOUlPi 0vG6Bnui6gZBJCEPSKC81MyanutTjW9aAmrfT5g7ATc2OOwRU3oRmdjgEt99kUKIbk2w +QCg== Received: by 10.216.218.143 with SMTP id k15mr4122104wep.142.1354579173039; Mon, 03 Dec 2012 15:59:33 -0800 (PST) Received: from diego-arch.localnet (79.109.113.83.dyn.user.ono.com. [79.109.113.83]) by mx.google.com with ESMTPS id y3sm13007338wix.6.2012.12.03.15.59.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 15:59:32 -0800 (PST) From: Diego Calleja To: linux-input@vger.kernel.org Cc: Dmitry Torokhov , Ping Cheng Subject: [PATCH] Fix touch support for wacom bamboo fun CTH-461 Date: Tue, 04 Dec 2012 00:56:50 +0100 Message-ID: <3305232.JQ4fXkYdWp@diego-arch> User-Agent: KMail/4.9.3 (Linux/3.7.0-rc8-dirty; KDE/4.9.3; x86_64; ; ) MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Commit f393ee2b814e3291c12565000210b3cf10aa5c1d forgot to add the touch_max property for wacom bamboo fun CTH-461/S, id 056a:00d2. This broke the touch functionality for that device. This patch, (done with help of Ping Cheng), adds the correct value and makes touch work again. (Note: this problem exists since 3.5, so it may be a candidate for -stable) Signed-off-by: Diego Calleja --- drivers/input/tablet/wacom_wac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/drivers/input/tablet/wacom_wac.c =================================================================== --- linux.orig/drivers/input/tablet/wacom_wac.c +++ linux/drivers/input/tablet/wacom_wac.c @@ -2034,7 +2034,8 @@ static const struct wacom_features wacom .touch_max = 2 }; static const struct wacom_features wacom_features_0xD2 = { "Wacom Bamboo Craft", WACOM_PKGLEN_BBFUN, 14720, 9200, 1023, - 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; + 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, + .touch_max = 2 }; static const struct wacom_features wacom_features_0xD3 = { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN, 21648, 13700, 1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,