Commit 0149931e authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom: set stylus_in_proximity before checking touch_down 



In wacom_bpt_pen, we checked touch_down before assigning new
stylus_in_proximity value. This would cause stylus_in_proximity not updated
properly if touch is down before pen is in proximity.

[jkosina@suse.cz: fix if-else style]
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Reviewed-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7d059ed0

drivers/hid/wacom_wac.c

+16 −18
Original line number Diff line number Diff line
@@ -1768,9 +1768,6 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) 
	if (data[0] != WACOM_REPORT_PENABLED)

	    return 0;



	if (wacom->shared->touch_down)

		return 0;



	prox = (data[1] & 0x20) == 0x20;



	/*
@@ -1783,7 +1780,6 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) 
	 *

	 * Hardware does report zero in most out-of-prox cases but not all.

	 */

	if (prox) {

	if (!wacom->shared->stylus_in_proximity) {

		if (data[1] & 0x08) {

			wacom->tool[0] = BTN_TOOL_RUBBER;
@@ -1792,8 +1788,13 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) 
			wacom->tool[0] = BTN_TOOL_PEN;

			wacom->id[0] = STYLUS_DEVICE_ID;

		}

			wacom->shared->stylus_in_proximity = true;

	}



	wacom->shared->stylus_in_proximity = prox;

	if (wacom->shared->touch_down)

		return 0;



	if (prox) {

		x = le16_to_cpup((__le16 *)&data[2]);

		y = le16_to_cpup((__le16 *)&data[4]);

		p = le16_to_cpup((__le16 *)&data[6]);
@@ -1809,6 +1810,8 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) 
		pen = data[1] & 0x01;

		btn1 = data[1] & 0x02;

		btn2 = data[1] & 0x04;

	} else {

		wacom->id[0] = 0;

	}



	input_report_key(input, BTN_TOUCH, pen);
@@ -1820,11 +1823,6 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) 
	input_report_abs(input, ABS_PRESSURE, p);

	input_report_abs(input, ABS_DISTANCE, d);



	if (!prox) {

		wacom->id[0] = 0;

		wacom->shared->stylus_in_proximity = false;

	}



	input_report_key(input, wacom->tool[0], prox); /* PEN or RUBBER */

	input_report_abs(input, ABS_MISC, wacom->id[0]); /* TOOL ID */

CRA Git | Maintained and supported by SUSTech CRA and CCSE