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

Commit 9d336daf authored by Jason Gerecke's avatar Jason Gerecke Committed by Dmitry Torokhov
Browse files

Input: wacom - allow any multi-input Intuos device to set prox 



The ability to set the proximity flag should apply to any device
that has both pen and touch input. Rather than listing classes of
devices known to meet this criteria, simply filter on the quirk
defining all such devices.

Signed-off-by: default avatarJason Gerecke <killertofu@gmail.com>
Tested-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 4e904954

drivers/input/tablet/wacom_wac.c

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 


	/* Enter report */

	if ((data[1] & 0xfc) == 0xc0) {

		if (features->type >= INTUOS5S && features->type <= INTUOS5L)

		if (features->quirks == WACOM_QUIRK_MULTI_INPUT)

			wacom->shared->stylus_in_proximity = true;



		/* serial number of the tool */
@@ -419,7 +419,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 


	/* Exit report */

	if ((data[1] & 0xfe) == 0x80) {

		if (features->type >= INTUOS5S && features->type <= INTUOS5L)

		if (features->quirks == WACOM_QUIRK_MULTI_INPUT)

			wacom->shared->stylus_in_proximity = false;



		/*