From: Peter Hutterer <peter.hutte...@who-t.net>
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.hutte...@who-t.net>
Acked-by: Benjamin Tissoires <benjamin.tissoi...@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
[jason.gere...@wacom.com: Imported into input-wacom repository (e171735)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom repository 5e9fc5d]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.38/wacom_w8001.c | 19 +++++++++----------
3.7/wacom_w8001.c | 19 +++++++++----------
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/2.6.38/wacom_w8001.c b/2.6.38/wacom_w8001.c
index b38f32e..9c1f1f0 100644
--- a/2.6.38/wacom_w8001.c
+++ b/2.6.38/wacom_w8001.c
@@ -385,7 +385,7 @@ static int w8001_setup(struct w8001 *w8001)
struct input_dev *dev = w8001->dev;
struct w8001_coord coord;
struct w8001_touch_query touch;
- int error;
+ int error, err_pen, err_touch;
error = w8001_command(w8001, W8001_CMD_STOP, false);
if (error)
@@ -400,8 +400,8 @@ static int w8001_setup(struct w8001 *w8001)
__set_bit(INPUT_PROP_DIRECT, dev->propbit);
/* penabled? */
- error = w8001_command(w8001, W8001_CMD_QUERY, true);
- if (!error) {
+ err_pen = w8001_command(w8001, W8001_CMD_QUERY, true);
+ if (!err_pen) {
__set_bit(BTN_TOUCH, dev->keybit);
__set_bit(BTN_TOOL_PEN, dev->keybit);
__set_bit(BTN_TOOL_RUBBER, dev->keybit);
@@ -426,13 +426,12 @@ static int w8001_setup(struct w8001 *w8001)
}
/* Touch enabled? */
- error = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);
+ err_touch = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);
- /*
- * Some non-touch devices may reply to the touch query. But their
- * second byte is empty, which indicates touch is not supported.
- */
- if (!error && w8001->response[1]) {
+ if (!err_touch && !w8001->response[1])
+ err_touch = -ENXIO;
+
+ if (!err_touch) {
__set_bit(BTN_TOUCH, 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));
- return 0;
+ return !err_pen || !err_touch ? 0 : -ENXIO;
}
/*
diff --git a/3.7/wacom_w8001.c b/3.7/wacom_w8001.c
index 222006e..9ea5f82 100644
--- a/3.7/wacom_w8001.c
+++ b/3.7/wacom_w8001.c
@@ -385,7 +385,7 @@ static int w8001_setup(struct w8001 *w8001)
struct input_dev *dev = w8001->dev;
struct w8001_coord coord;
struct w8001_touch_query touch;
- int error;
+ int error, err_pen, err_touch;
error = w8001_command(w8001, W8001_CMD_STOP, false);
if (error)
@@ -400,8 +400,8 @@ static int w8001_setup(struct w8001 *w8001)
__set_bit(INPUT_PROP_DIRECT, dev->propbit);
/* penabled? */
- error = w8001_command(w8001, W8001_CMD_QUERY, true);
- if (!error) {
+ err_pen = w8001_command(w8001, W8001_CMD_QUERY, true);
+ if (!err_pen) {
__set_bit(BTN_TOUCH, dev->keybit);
__set_bit(BTN_TOOL_PEN, dev->keybit);
__set_bit(BTN_TOOL_RUBBER, dev->keybit);
@@ -426,13 +426,12 @@ static int w8001_setup(struct w8001 *w8001)
}
/* Touch enabled? */
- error = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);
+ err_touch = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);
- /*
- * Some non-touch devices may reply to the touch query. But their
- * second byte is empty, which indicates touch is not supported.
- */
- if (!error && w8001->response[1]) {
+ if (!err_touch && !w8001->response[1])
+ err_touch = -ENXIO;
+
+ if (!err_touch) {
__set_bit(BTN_TOUCH, 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));
- return 0;
+ return !err_pen || !err_touch ? 0 : -ENXIO;
}
/*
--
2.7.1
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
