From patchwork Wed Dec 16 21:37:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 7866061 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 C028F9F350 for ; Wed, 16 Dec 2015 21:38:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E47F7203E6 for ; Wed, 16 Dec 2015 21:38:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D305203C2 for ; Wed, 16 Dec 2015 21:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966401AbbLPVh5 (ORCPT ); Wed, 16 Dec 2015 16:37:57 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33507 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966369AbbLPVh4 (ORCPT ); Wed, 16 Dec 2015 16:37:56 -0500 Received: by mail-pf0-f171.google.com with SMTP id e66so19053070pfe.0 for ; Wed, 16 Dec 2015 13:37:55 -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=U3LYhy3TFaYoQbgS3fKlP9QLH9VtEzwYhDu0whkRr6Q=; b=MwrpJPryEJN+H20RdwaE4DeMb81fJqsiIjw83BekljL48iN3kEy2k2adzfFkOq1UXd mGiCoHFw/UNN47+36xo9Kwtrgo7vY4lQY/qkrOp1AzGC7b52/jp56T3+QOU1d4ZxBiBC wKDbjwF3kj6UrT+KZdSmdg600Uxxz8BIakW+cvzMDq58hzkUf942Cb8mxfxpmYy3mQlq PkuaK9U34RWiVmaoWT978ZzrVpRP7Vrd5dDdFj8j/cw0Sfhb57TKIg+URGTTvZ4Yu4mq ErdFskInxDggcoepGUGaMchjHwTQlhHweNEiU6fqOMnCYSGxNfEG2bbBP/k7ogDgKGHa AVkg== X-Received: by 10.98.74.199 with SMTP id c68mr9086278pfj.100.1450301875738; Wed, 16 Dec 2015 13:37:55 -0800 (PST) Received: from wacom-arch2.corp.onewacom.com ([67.51.163.2]) by smtp.gmail.com with ESMTPSA id x12sm6808370pfi.95.2015.12.16.13.37.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 13:37:54 -0800 (PST) From: Jason Gerecke To: linux-input@vger.kernel.org Cc: Jiri Kosina , Ping Cheng , Aaron Skomra , Jason Gerecke , Jason Gerecke Subject: [PATCH 1/4] HID: wacom: Limit touchstrip data to 13 bits Date: Wed, 16 Dec 2015 13:37:33 -0800 Message-Id: <1450301856-7253-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.6.3 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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Commit c7f0522 uses sixteen bits of data in the construction of 'strip1' and 'strip2'. This can cause problems in some cases, however, since some tablets store flags in the MSB of data[2] and data[4] that should not be included in these values. This restores the 0x1f mask that used prior to c7f0522. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_wac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 22d3225..cf87810 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -545,8 +545,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) ((data[6] & 0x0F) << 4) | (data[5] & 0x0F); } - strip1 = (data[1] << 8) | data[2]; - strip2 = (data[3] << 8) | data[4]; + strip1 = ((data[1] & 0x1f) << 8) | data[2]; + strip2 = ((data[3] & 0x1f) << 8) | data[4]; } prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |