diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2016-06-23 10:55:11 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-10 12:54:45 +0200 |
| commit | fccb889282f611ad71f9b45ed3e36d9a262f4815 (patch) | |
| tree | 11331f50f7bae800c0b3688a22df8f28c37a316c /drivers | |
| parent | d80f15e3de301d0dafa2568d236b5689092715f3 (diff) | |
| download | linux-stable-fccb889282f611ad71f9b45ed3e36d9a262f4815.tar.gz linux-stable-fccb889282f611ad71f9b45ed3e36d9a262f4815.tar.bz2 linux-stable-fccb889282f611ad71f9b45ed3e36d9a262f4815.zip | |
Input: wacom_w8001 - ignore invalid pen data packets
commit 9e72ac7492149a229ce9039c680849cb682d7092 upstream.
ThinkPad X60 Tablet PC (pen only device) sometime posts
packets that are larger than W8001_PKTLEN_TPCPEN.
Reported-by: Chris J Arges <christopherarges@gmail.com>
Tested-by: Chris J Arges <christopherarges@gmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/wacom_w8001.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c index b1b412766da8..0c9191cf324d 100644 --- a/drivers/input/touchscreen/wacom_w8001.c +++ b/drivers/input/touchscreen/wacom_w8001.c @@ -339,6 +339,15 @@ static irqreturn_t w8001_interrupt(struct serio *serio, w8001->idx = 0; parse_multi_touch(w8001); break; + + default: + /* + * ThinkPad X60 Tablet PC (pen only device) sometimes + * sends invalid data packets that are larger than + * W8001_PKTLEN_TPCPEN. Let's start over again. + */ + if (!w8001->touch_dev && w8001->idx > W8001_PKTLEN_TPCPEN - 1) + w8001->idx = 0; } return IRQ_HANDLED; |