Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 619d3a29 authored by Aaron Armstrong Skomra's avatar Aaron Armstrong Skomra Committed by Jiri Kosina
Browse files

HID: wacom: bluetooth: send exit report for recent Bluetooth devices 



The code path for recent Bluetooth devices omits an exit report which
resets all the values of the device.

Fixes: 4922cd26 ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface")
Cc: <stable@vger.kernel.org> # 4.11
Signed-off-by: default avatarAaron Armstrong Skomra <aaron.skomra@wacom.com>
Reviewed-by: default avatarPing Cheng <ping.cheng@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a955358d

drivers/hid/wacom_wac.c

+46 −30
Original line number Diff line number Diff line
@@ -689,6 +689,45 @@ static int wacom_intuos_get_tool_type(int tool_id) 
	return tool_type;

}



static void wacom_exit_report(struct wacom_wac *wacom)

{

	struct input_dev *input = wacom->pen_input;

	struct wacom_features *features = &wacom->features;

	unsigned char *data = wacom->data;

	int idx = (features->type == INTUOS) ? (data[1] & 0x01) : 0;



	/*

	 * Reset all states otherwise we lose the initial states

	 * when in-prox next time

	 */

	input_report_abs(input, ABS_X, 0);

	input_report_abs(input, ABS_Y, 0);

	input_report_abs(input, ABS_DISTANCE, 0);

	input_report_abs(input, ABS_TILT_X, 0);

	input_report_abs(input, ABS_TILT_Y, 0);

	if (wacom->tool[idx] >= BTN_TOOL_MOUSE) {

		input_report_key(input, BTN_LEFT, 0);

		input_report_key(input, BTN_MIDDLE, 0);

		input_report_key(input, BTN_RIGHT, 0);

		input_report_key(input, BTN_SIDE, 0);

		input_report_key(input, BTN_EXTRA, 0);

		input_report_abs(input, ABS_THROTTLE, 0);

		input_report_abs(input, ABS_RZ, 0);

	} else {

		input_report_abs(input, ABS_PRESSURE, 0);

		input_report_key(input, BTN_STYLUS, 0);

		input_report_key(input, BTN_STYLUS2, 0);

		input_report_key(input, BTN_TOUCH, 0);

		input_report_abs(input, ABS_WHEEL, 0);

		if (features->type >= INTUOS3S)

			input_report_abs(input, ABS_Z, 0);

	}

	input_report_key(input, wacom->tool[idx], 0);

	input_report_abs(input, ABS_MISC, 0); /* reset tool id */

	input_event(input, EV_MSC, MSC_SERIAL, wacom->serial[idx]);

	wacom->id[idx] = 0;

}



static int wacom_intuos_inout(struct wacom_wac *wacom)

{

	struct wacom_features *features = &wacom->features;
@@ -741,36 +780,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 
		if (!wacom->id[idx])

			return 1;



		/*

		 * Reset all states otherwise we lose the initial states

		 * when in-prox next time

		 */

		input_report_abs(input, ABS_X, 0);

		input_report_abs(input, ABS_Y, 0);

		input_report_abs(input, ABS_DISTANCE, 0);

		input_report_abs(input, ABS_TILT_X, 0);

		input_report_abs(input, ABS_TILT_Y, 0);

		if (wacom->tool[idx] >= BTN_TOOL_MOUSE) {

			input_report_key(input, BTN_LEFT, 0);

			input_report_key(input, BTN_MIDDLE, 0);

			input_report_key(input, BTN_RIGHT, 0);

			input_report_key(input, BTN_SIDE, 0);

			input_report_key(input, BTN_EXTRA, 0);

			input_report_abs(input, ABS_THROTTLE, 0);

			input_report_abs(input, ABS_RZ, 0);

		} else {

			input_report_abs(input, ABS_PRESSURE, 0);

			input_report_key(input, BTN_STYLUS, 0);

			input_report_key(input, BTN_STYLUS2, 0);

			input_report_key(input, BTN_TOUCH, 0);

			input_report_abs(input, ABS_WHEEL, 0);

			if (features->type >= INTUOS3S)

				input_report_abs(input, ABS_Z, 0);

		}

		input_report_key(input, wacom->tool[idx], 0);

		input_report_abs(input, ABS_MISC, 0); /* reset tool id */

		input_event(input, EV_MSC, MSC_SERIAL, wacom->serial[idx]);

		wacom->id[idx] = 0;

		wacom_exit_report(wacom);

		return 2;

	}
@@ -1235,6 +1245,12 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) 
		if (!valid)

			continue;



		if (!prox) {

			wacom->shared->stylus_in_proximity = false;

			wacom_exit_report(wacom);

			input_sync(pen_input);

			return;

		}

		if (range) {

			input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));

			input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));