From patchwork Thu Aug 31 22:50:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 9932987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A292760309 for ; Thu, 31 Aug 2017 22:50:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87D40283C8 for ; Thu, 31 Aug 2017 22:50:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A546283FD; Thu, 31 Aug 2017 22:50:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AB8C28173 for ; Thu, 31 Aug 2017 22:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751205AbdHaWuN (ORCPT ); Thu, 31 Aug 2017 18:50:13 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:37838 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbdHaWuM (ORCPT ); Thu, 31 Aug 2017 18:50:12 -0400 Received: by mail-pf0-f194.google.com with SMTP id a2so571826pfj.4 for ; Thu, 31 Aug 2017 15:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Y6ZwX32UfERw8W3P5hEXLvoCDWmoBClEEcW6Hz2vuvE=; b=pL4ASkOLEvekWpKbLocOUxq57PMj0dJU6RMsr0mYQPFn7/+Lyt2GP+0dUG/7TwQupm k5W1gkg49owEenCc8yi7xbuRkStlXmatqDTFgb4mujU0GzUyaXl700Yfgdikgd/MTvWX THUNJM15TX2DS4lmcBwnuGymhPxgv5RhU2Gtn4iJ/MsUSgSSaXFNJD40WbzgpQOEbqLA SdE/bZ7NhePiNfn8p6kDPYFvTVe5MRk++KoARlx+D5D0FWLUFPcBgYILG7MrIAchnfHi cKEQsYUmtVK8P8QlE57ZRh34XlDDcbWmmr0HIwwN6ihyoe/mpSMCNV9zh8OwIsl5erc9 vAQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Y6ZwX32UfERw8W3P5hEXLvoCDWmoBClEEcW6Hz2vuvE=; b=i4YGgSylCeQiUrdhqJtGfPKnzUfAiVlutw9dQJ/EOgbFZe/qxW7XwpXaZn+k6KpMBZ h+nBCTp2JKRrWEfwKsRA6qm2V57XtZaeAYThTOqAIT5xFmJUkcJgw1m0vbFjfS7ipFD2 lWme77ONl0QisqYe38H+8crv1eojP6q3r2ebAWOT5/dcG+qW+DaRFe73hudpRcfwSKpU xU85UCXpii0t8oJ5soRcrCmVBOt/XEnotHNUCYanT7gzG8kBs9E2Ve9PeXq16xQ8du3D U0vlkfNZKO73YGyIXZCmhab6rRTyHYqPMBjL7r/AyFM82DRt+Z91BGgLH6nqffuD9X8w PopQ== X-Gm-Message-State: AHPjjUiYr1Hbvo3Dmua0Jrbnpa18Dtc1tu3gV4jkjl/NbR2UydNh1s20 zR4woFzCJMBQtGCU X-Google-Smtp-Source: ADKCNb4ugs6eQWamW8fHfnbXzIpONj/5dMPAgH/rP/3hagIB6vFOf9ZkW4Fx8y5y5jiLTggvvnddsg== X-Received: by 10.84.214.9 with SMTP id h9mr21316pli.9.1504219812281; Thu, 31 Aug 2017 15:50:12 -0700 (PDT) Received: from localhost.localdomain ([66.96.64.82]) by smtp.gmail.com with ESMTPSA id i4sm834924pgr.42.2017.08.31.15.50.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 15:50:11 -0700 (PDT) From: Ping Cheng X-Google-Original-From: Ping Cheng To: jikos@kernel.org Cc: linux-input@vger.kernel.org, Ping Cheng Subject: [PATCH] HID: wacom: bits shifted too much for 9th and 10th buttons Date: Thu, 31 Aug 2017 15:50:03 -0700 Message-Id: <20170831225003.5247-1-ping.cheng@wacom.com> X-Mailer: git-send-email 2.9.5 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cintiq 12 has 10 expresskey buttons. The bit shift for the last two buttons were off by 5. Fixes: c7f0522 ("HID: wacom: Slim down wacom_intuos_pad processing") Signed-off-by: Ping Cheng Tested-by: Matthieu Robin --- 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 9f94029..801889c 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -567,8 +567,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) keys = data[9] & 0x07; } } else { - buttons = ((data[6] & 0x10) << 10) | - ((data[5] & 0x10) << 9) | + buttons = ((data[6] & 0x10) << 5) | + ((data[5] & 0x10) << 4) | ((data[6] & 0x0F) << 4) | (data[5] & 0x0F); }