Skip to content

Commit 99ed939

Browse files
jigpugregkh
authored andcommitted
HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser contact
commit fe7f8d7 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: 4922cd2 ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface") Cc: <stable@vger.kernel.org> # 4.11+ Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Reviewed-by: Aaron Skomra <aaron.skomra@wacom.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a146177 commit 99ed939

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/hid/wacom_wac.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
12991299
range ? frame[7] : wacom->features.distance_max);
13001300
}
13011301

1302-
input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
1302+
input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x09);
13031303
input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
13041304
input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
13051305

0 commit comments

Comments
 (0)