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

Commit e1717354 authored by Peter Hutterer's avatar Peter Hutterer Committed by Dmitry Torokhov
Browse files

Input: wacom_w8001 - handle touch error case correctly 



If a device failed at the pen setup and gets a zero reply from the touch
device, we need to return an error. Otherwise we have a device with
nothing but a name and the EV_KEY and EV_ABS bits.

Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ec9acda7

drivers/input/touchscreen/wacom_w8001.c

+9 −10
Original line number Original line Diff line number Diff line
@@ -385,7 +385,7 @@ static int w8001_setup(struct w8001 *w8001) 
	struct input_dev *dev = w8001->dev;

	struct input_dev *dev = w8001->dev;

	struct w8001_coord coord;

	struct w8001_coord coord;

	struct w8001_touch_query touch;

	struct w8001_touch_query touch;

	int error;

	int error, err_pen, err_touch;





	error = w8001_command(w8001, W8001_CMD_STOP, false);

	error = w8001_command(w8001, W8001_CMD_STOP, false);

	if (error)

	if (error)
@@ -400,8 +400,8 @@ static int w8001_setup(struct w8001 *w8001) 
	__set_bit(INPUT_PROP_DIRECT, dev->propbit);

	__set_bit(INPUT_PROP_DIRECT, dev->propbit);





	/* penabled? */

	/* penabled? */

	error = w8001_command(w8001, W8001_CMD_QUERY, true);

	err_pen = w8001_command(w8001, W8001_CMD_QUERY, true);

	if (!error) {

	if (!err_pen) {

		__set_bit(BTN_TOUCH, dev->keybit);

		__set_bit(BTN_TOUCH, dev->keybit);

		__set_bit(BTN_TOOL_PEN, dev->keybit);

		__set_bit(BTN_TOOL_PEN, dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, dev->keybit);
@@ -426,13 +426,12 @@ static int w8001_setup(struct w8001 *w8001) 
	}

	}





	/* Touch enabled? */

	/* Touch enabled? */

	error = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);

	err_touch = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);





	/*

	if (!err_touch && !w8001->response[1])

	 * Some non-touch devices may reply to the touch query. But their

		err_touch = -ENXIO;

	 * second byte is empty, which indicates touch is not supported.



	 */

	if (!err_touch) {

	if (!error && w8001->response[1]) {

		__set_bit(BTN_TOUCH, dev->keybit);

		__set_bit(BTN_TOUCH, dev->keybit);

		__set_bit(BTN_TOOL_FINGER, dev->keybit);

		__set_bit(BTN_TOOL_FINGER, dev->keybit);
@@ -491,7 +490,7 @@ static int w8001_setup(struct w8001 *w8001) 




	strlcat(w8001->name, " Touchscreen", sizeof(w8001->name));

	strlcat(w8001->name, " Touchscreen", sizeof(w8001->name));





	return 0;

	return !err_pen || !err_touch ? 0 : -ENXIO;

}

}





/*

/*