From patchwork Tue Feb 7 23:24:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 9561509 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 6589360236 for ; Tue, 7 Feb 2017 23:24:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B38C2847D for ; Tue, 7 Feb 2017 23:24:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EED528488; Tue, 7 Feb 2017 23:24:22 +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 CD6652847D for ; Tue, 7 Feb 2017 23:24:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754834AbdBGXYV (ORCPT ); Tue, 7 Feb 2017 18:24:21 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33501 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754666AbdBGXYU (ORCPT ); Tue, 7 Feb 2017 18:24:20 -0500 Received: by mail-pg0-f66.google.com with SMTP id 194so13307106pgd.0 for ; Tue, 07 Feb 2017 15:24:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=a/vYzs46PTs8zvZjQYwvK1+fPfDn3mEDML00BVDJg00=; b=X4EoDwMPNmLQMUIsTzifojuZ7yrnZEadc219F8q8DDsx8xEKDwQ96UnrnZmKr/ELj2 33HST90aRxI7BKLnaIhDtTihX/hgvDX/M2rPF9RyUim0VXut6hbwj0f8PD/EZO7HqPRr XtLlvVCM1bITPBD7jlNlvDA4kQTyuv3/glFoQSEvRt4a/MyC3Byd4za5jRxq2lMtmeZw uq+IDS9Yh8sich7l1iVGs9ubciK9WwqqIlT5tNG3dXnFq/oPr2beh2iuUxB/M8sZFP3y 9Hr1WJfdD3bWtzwm3h/BakLdRgTCaVKlAZfRpykrYm8sMCGtI0xpHlc8aHOd7RKpYV9N CWpw== 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=a/vYzs46PTs8zvZjQYwvK1+fPfDn3mEDML00BVDJg00=; b=S/4eQehghJFGp6b/yIMESx3WkczYdreWE6DFL0ZhSCcfVlckwsFOTphG9QSQ7cmuTY 4ADG3ROlNsNK0meYNxV2A7JKTPtU0uaYfsygjdycRLVvFGhe7G2F/oSyMjUcPxrgVKjz kBUwdD914+PL3FxjZnYuSOQ9Y7hbIVkJ7MSn5fBOY/vmWGeM16mEMXL51l2jIiuagTS4 aZf8REcpSIqmoNm6dQp2ne1zxC3MGFE4r9Xz6Xm9Ayr4oikuAWbQn86gYDqmgQKjKkoI ye4JmawpAIXOlfPYBFSyJvCAZgSHX9xgKiNxgW0NUOH725jzTbMQPlRJkd/cdYIFyHrb nFxA== X-Gm-Message-State: AIkVDXI6jfX1JB2xsa1AnRHlxiuzCGGnt+K0qMoi5FlUPCDXKez+bQgg9qMMz8kSwu5sYg== X-Received: by 10.98.152.218 with SMTP id d87mr22327670pfk.17.1486509859544; Tue, 07 Feb 2017 15:24:19 -0800 (PST) Received: from wacom-XPS-8500.corp.onewacom.com ([50.225.60.4]) by smtp.gmail.com with ESMTPSA id j185sm14158173pgd.35.2017.02.07.15.24.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Feb 2017 15:24:18 -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 , Ping Cheng Subject: [PATCH] HID: wacom: generic: Wacom mouse is only provided for opaque tablets Date: Tue, 7 Feb 2017 15:24:11 -0800 Message-Id: <1486509851-2977-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 2.7.4 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 So, don't add mouse and lens cursor tools. Signed-off-by: Ping Cheng Reviewed-by: Jason Gerecke --- drivers/hid/wacom_wac.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index d51daf5..b51aa27 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1952,8 +1952,10 @@ static void wacom_wac_pen_usage_mapping(struct hid_device *hdev, input_set_capability(input, EV_KEY, BTN_TOOL_BRUSH); input_set_capability(input, EV_KEY, BTN_TOOL_PENCIL); input_set_capability(input, EV_KEY, BTN_TOOL_AIRBRUSH); - input_set_capability(input, EV_KEY, BTN_TOOL_MOUSE); - input_set_capability(input, EV_KEY, BTN_TOOL_LENS); + if (!(features->device_type & WACOM_DEVICETYPE_DIRECT)) { + input_set_capability(input, EV_KEY, BTN_TOOL_MOUSE); + input_set_capability(input, EV_KEY, BTN_TOOL_LENS); + } break; case WACOM_HID_WD_FINGERWHEEL: wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);