From patchwork Sat Jan 9 01:16:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 7991571 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D3659F6FA for ; Sat, 9 Jan 2016 01:16:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68446201C7 for ; Sat, 9 Jan 2016 01:16:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80DED201C8 for ; Sat, 9 Jan 2016 01:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753427AbcAIBQd (ORCPT ); Fri, 8 Jan 2016 20:16:33 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34740 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753281AbcAIBQc (ORCPT ); Fri, 8 Jan 2016 20:16:32 -0500 Received: by mail-pf0-f193.google.com with SMTP id 65so1311175pfd.1 for ; Fri, 08 Jan 2016 17:16:32 -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; bh=8izwfiSxM6gVevkDWaTxHMbtNAnT5eHyLSq4g+qGgJc=; b=bKnpau4268Lv8NZWqL6Qalrj8n05ehsxgCJxau+mHTQfdg/AB6u0Tr+VoD6+IgAyxf A61spN5CLMqE8qujtFOe13Kf2DsFSNzvkcgmfjXZ/jUC13wn8FiQuXoXI2JEAqDUgSfU b4iUbZqVsmUGNouMrGcyjQF2zc17T9+Rm/BfEi/B1khrCs5XAPoPN+ltudJc6YAsHBgf BOeOeDhAHdzqFIbhG1hv6m6UHkwt5Aqm/zitKUQ6HuSCo6wnou5CQB2abG+S+brt4U9L r5ivQfyU72tzX86IIsaS6epy5gz8To+3UmvJLRH1xXGRo9jdN7xzym6ODPZGLFOoUI5M QSiA== X-Received: by 10.98.87.20 with SMTP id l20mr8682864pfb.70.1452302192181; Fri, 08 Jan 2016 17:16:32 -0800 (PST) Received: from wacom-XPS-8500.corp.onewacom.com ([67.51.163.2]) by smtp.gmail.com with ESMTPSA id z7sm7345720pfi.19.2016.01.08.17.16.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 17:16:31 -0800 (PST) From: Ping Cheng X-Google-Original-From: Ping Cheng To: linux-input@vger.kernel.org Cc: jkosina@suse.cz, killertofu@gmail.com, Ping Cheng Subject: [PATCH 4/4] HID: wacom - Add quirks for INTUOSHT2 in range events Date: Fri, 8 Jan 2016 17:16:25 -0800 Message-Id: <1452302185-5641-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP INTUOSHT2 in range event is not used to indicate in proximity state. INTUOSHT2 only has one stylus. Signed-off-by: Ping Cheng Reviewed-by: Jason Gerecke --- drivers/hid/wacom_wac.c | 4 +++++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index af9ecf4..8ea2465 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -609,6 +609,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) case 0x885: /* Intuos3 Marker Pen */ case 0x802: /* Intuos4/5 13HD/24HD General Pen */ case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */ + case 0x8e2: /* IntuosHT2 pen */ case 0x022: case 0x100804: /* Intuos4/5 13HD/24HD Art Pen */ case 0x140802: /* Intuos4/5 13HD/24HD Classic Pen */ @@ -676,7 +677,8 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) /* in Range */ if ((data[1] & 0xfe) == 0x20) { - wacom->shared->stylus_in_proximity = true; + if (features->type != INTUOSHT2) + wacom->shared->stylus_in_proximity = true; /* in Range while exiting */ if (wacom->reporting_data) {