From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96E64C31E5C for ; Mon, 17 Jun 2019 21:25:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CC5C20861 for ; Mon, 17 Jun 2019 21:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806705; bh=WSDxNXKrzUdUfmYGEAMj19B6OTgkWuGE5j0c+l/AW/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C9cW4rEpXf45ADOkwzTHQJExrNcgghlu34nu7Pl5GRNbUjfJ4AZMdVvE0kTwtFH1Z KM4trRQVWzdoW0PKRrerRI8aIRy8kXmsVJSEvHqGNE2UIjL8PUTN5wUcPCHwxjrMh/ 9BXc0emyHIkcrIkd6RLPGc8Dif0UFwA1ec6cQXEA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729551AbfFQVZD (ORCPT ); Mon, 17 Jun 2019 17:25:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:50968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729627AbfFQVZC (ORCPT ); Mon, 17 Jun 2019 17:25:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C112321670; Mon, 17 Jun 2019 21:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806701; bh=WSDxNXKrzUdUfmYGEAMj19B6OTgkWuGE5j0c+l/AW/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+qk5VvtxzKpqlOuB0r8mk3BS6miDy1Wa3jjagnCrPdCto0TJOvEfBujAfqSPSLB/ H5OgxWmlIfY+KObKAzfXoKql5PQVtDIhYGMsbUW2xgTYSXs1+7i69uBA/I4eQL28g6 3NpmmVsteA37clFTdj7XHr9Y1WWGQeCrBSUKNXEA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Gerecke , Aaron Skomra , Benjamin Tissoires Subject: [PATCH 4.19 06/75] HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser contact Date: Mon, 17 Jun 2019 23:09:17 +0200 Message-Id: <20190617210753.073825011@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210752.799453599@linuxfoundation.org> References: <20190617210752.799453599@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gerecke commit fe7f8d73d1af19b678171170e4e5384deb57833d upstream. The Bluetooth reports from the 2nd-gen Intuos Pro have separate bits for indicating if the tip or eraser is in contact with the tablet. At the moment, only the tip contact bit controls the state of the BTN_TOUCH event. This prevents the eraser from working as expected. This commit changes the driver to send BTN_TOUCH whenever either the tip or eraser contact bit is set. Fixes: 4922cd26f03c ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface") Cc: # 4.11+ Signed-off-by: Jason Gerecke Reviewed-by: Aaron Skomra Signed-off-by: Benjamin Tissoires Signed-off-by: Greg Kroah-Hartman --- drivers/hid/wacom_wac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1299,7 +1299,7 @@ static void wacom_intuos_pro2_bt_pen(str range ? frame[7] : wacom->features.distance_max); } - input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01); + input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x09); input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02); input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);