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

Commit 6af0b78c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - fix pressure in Cintiq 21UX2
parents 58d79e71 ca047fed

drivers/input/tablet/wacom_wac.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -442,8 +442,10 @@ static void wacom_intuos_general(struct wacom_wac *wacom) 
	/* general pen packet */

	/* general pen packet */

	if ((data[1] & 0xb8) == 0xa0) {

	if ((data[1] & 0xb8) == 0xa0) {

		t = (data[6] << 2) | ((data[7] >> 6) & 3);

		t = (data[6] << 2) | ((data[7] >> 6) & 3);

		if (features->type >= INTUOS4S && features->type <= INTUOS4L)

		if ((features->type >= INTUOS4S && features->type <= INTUOS4L) ||

		    features->type == WACOM_21UX2) {

			t = (t << 1) | (data[1] & 1);

			t = (t << 1) | (data[1] & 1);

		}

		input_report_abs(input, ABS_PRESSURE, t);

		input_report_abs(input, ABS_PRESSURE, t);

		input_report_abs(input, ABS_TILT_X,

		input_report_abs(input, ABS_TILT_X,

				((data[7] << 1) & 0x7e) | (data[8] >> 7));

				((data[7] << 1) & 0x7e) | (data[8] >> 7));