projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae10850
)
Input: wacom_w8001 - handle errors from input_mt_init_slots()
author
Ping Cheng
<pinglinux@gmail.com>
Tue, 19 Jul 2016 18:13:17 +0000
(11:13 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 19 Jul 2016 18:42:44 +0000
(11:42 -0700)
input_mt_init_slots() may fail and we should be handling failures properly.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/wacom_w8001.c
patch
|
blob
|
history
diff --git
a/drivers/input/touchscreen/wacom_w8001.c
b/drivers/input/touchscreen/wacom_w8001.c
index
c1dac86
..
85e9572
100644
(file)
--- a/
drivers/input/touchscreen/wacom_w8001.c
+++ b/
drivers/input/touchscreen/wacom_w8001.c
@@
-518,7
+518,13
@@
static int w8001_setup_touch(struct w8001 *w8001, char *basename,
w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
__set_bit(BTN_TOOL_DOUBLETAP, dev->keybit);
- input_mt_init_slots(dev, 2, 0);
+ error = input_mt_init_slots(dev, 2, 0);
+ if (error) {
+ dev_err(&w8001->serio->dev,
+ "failed to initialize MT slots: %d\n", error);
+ return error;
+ }
+
input_set_abs_params(dev, ABS_MT_POSITION_X,
0, touch.x, 0, 0);
input_set_abs_params(dev, ABS_MT_POSITION_Y,