mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-19 09:04:57 +00:00
Code Issues Releases Wiki Activity

Input: wacom_w8001 - handle touch error case correctly

Browse source 
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: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Peter Hutterer 2015-12-03 12:24:26 -08:00 committed by Dmitry Torokhov
parent ec9acda736
commit e171735410
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/input/touchscreen/wacom_w8001.c
View file

@ -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;
} }
/* /*