Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3010676ybi; Mon, 17 Jun 2019 14:37:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxBmUrCvIqKXK59d+5/dq6ZvoWiyUWklnwiXFs3d45rdad9AX3fKRo+iRoKJJNQPRwf7Tlf X-Received: by 2002:aa7:8555:: with SMTP id y21mr59382222pfn.104.1560807459691; Mon, 17 Jun 2019 14:37:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560807459; cv=none; d=google.com; s=arc-20160816; b=khWacwBAVj8scnZ/8IjPUUPBkSqa6SwDoMKMbH9DDcZ5riF3NpuJic/5bHCBbM3YyC MCmYA7iKt+TpxzH6DWi4TSDTOAYGePtPnrnqJEz+E6zQO+1jmZjoNN+0AS0HFKGVze/0 3Ieqy+SeFx1DIWy6qKZqDKlJdgFySnPZJLHRXmmFhNjtVeCtUc/2T4X2qYwNCkaqrzKA 0Pff7y/qss2qyydbvCJfomAEddPlOkkz85CJrpOot+Z9LBOKIQGC/ONiZEpLwwx/Sqxo B2w1OXdRQkBSUUgAWlmJvT4mC65adxgcltOkYJ0vKPIiWRACy9aji4MzqsNKM+b/rz6V y6tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sUjhxpH5X/4caAhgDOL4b0IEhY/ggmulZPul2lXOCl0=; b=u3U+/AXd7kbqbDV6Ps7dJE8TzzPohE6EOqqFUN2TKOX5MSmyyFWtLKXOyo3tfxnkYB hZHaaCZ0dYZbCycQKDyYZEQxP2WUhUuSvbqWf233DpD+itjlIXSraHLVf/fJmw3CJIXE dYPwpO5DVuikO1onbGNpt7oCMlyeOncgZMOn6cXd6bgB58kySblpF8kAaTeQwppeglOm uvwWQsedfoOuPYodF4+8pw5Q2NSkgGRrYR9JrhdEIfUY+OeM/KLj6+P/kiZAczNlVZmE NJ6PqfwWsa06KLk/xPrJAbELUQIhrnzg6YvEDWy9E4mRc5WLezt3CKbftjmJ5J+1n76j vFrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=R4cFRTjS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m6si11235049pgq.275.2019.06.17.14.37.23; Mon, 17 Jun 2019 14:37:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=R4cFRTjS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729111AbfFQVU2 (ORCPT + 99 others); Mon, 17 Jun 2019 17:20:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:44602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729093AbfFQVUY (ORCPT ); Mon, 17 Jun 2019 17:20:24 -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 93B5F21881; Mon, 17 Jun 2019 21:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806424; bh=fwr27nbyLR8cixJMufn3KrmACVWcc6NROmLVUchmjQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R4cFRTjS/SGtsMJRkBRM5LcV4kzSh/6GVz6Ra4z4F/vbA2Nj6aV0143ss0NjTcCPk CIGSeK2JBypf1w3NmDo8HKfgcWJQ05vsVDHLx3OzhkWqegK/OyOnQgBzFj6SvJCVwP Au8W/dJfMv0reugYWrk54DaQlZEC+s33ffEvkOZw= 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 5.1 009/115] HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser contact Date: Mon, 17 Jun 2019 23:08:29 +0200 Message-Id: <20190617210800.382847392@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -1301,7 +1301,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);