From patchwork Tue Aug 18 00:41:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 7027951 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0B531C05AC for ; Tue, 18 Aug 2015 00:42:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33AFB207C5 for ; Tue, 18 Aug 2015 00:42:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38D44207BA for ; Tue, 18 Aug 2015 00:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751296AbbHRAmT (ORCPT ); Mon, 17 Aug 2015 20:42:19 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:36265 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbbHRAmS (ORCPT ); Mon, 17 Aug 2015 20:42:18 -0400 Received: by pawq9 with SMTP id q9so21826714paw.3 for ; Mon, 17 Aug 2015 17:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=gXtC7Z4FfQIqazfLLexZJVHemCypFm56Io0/UicUhNY=; b=TYpPuz6uyYKDB9f0YEgnZqbgPmRszSeuvFcXBDvQVkBQepAt/BYXnYLdBv9DooubYP I23XheJvYlwGjKTW4Taf6wP8xfVOCCKcNk5AdmMl0WMCk2S5onZI/U03zOfdqznw+KXp t0z2HxlLkw8nWs4Ekzx5Nixroc5FVM4PWf9LGtzjhiDj7lZSYLMxl254DTzWAmaIm1o5 sqBsshnnlANqjsOAAE3tZTV76FirkosQRvEyneVMKzLBFOFgPAqSpdRkMwHIsG2TduHY Mkh2ETYIVUHazq2TzzP8NtEklvlSd/UFksctWkEFbrGYz17/djNPfHpdIfRQCy/nxl3r ObQA== X-Received: by 10.68.116.142 with SMTP id jw14mr7676889pbb.147.1439858538355; Mon, 17 Aug 2015 17:42:18 -0700 (PDT) Received: from wacom-arch2.localdomain ([67.51.163.2]) by smtp.gmail.com with ESMTPSA id y9sm4373534pas.42.2015.08.17.17.42.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Aug 2015 17:42:17 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org, Jiri Kosina Cc: Ping Cheng , Aaron Skomra , Jason Gerecke , Jason Gerecke Subject: [PATCH] HID: wacom: Use tablet-provided touch height/width values for INTUOSHT Date: Mon, 17 Aug 2015 17:41:53 -0700 Message-Id: <1439858513-10581-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 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 The current generation of "Intuos" tablets (i.e. INTUOSHT) report touch width and height data just like the "Intuos Pro" do. This commit changes the code to allow these tablets to use the appropriate codepath instead of the one intended for Intuos5/Bamboo. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_wac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index fe164df..3024a3c 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1772,7 +1772,7 @@ static void wacom_bpt3_touch_msg(struct wacom_wac *wacom, unsigned char *data) int y = (data[3] << 4) | (data[4] & 0x0f); int width, height; - if (features->type >= INTUOSPS && features->type <= INTUOSPL) { + if (features->type >= INTUOSPS && features->type <= INTUOSHT) { width = data[5] * 100; height = data[6] * 100; } else {