* [PATCH input-wacom 2/4] backport: Input: wacom_w8001 - w8001_MAX_LENGTH should be 13
[not found] <1468449929-17092-1-git-send-email-skomra@gmail.com>
@ 2016-07-13 22:45 ` Aaron Armstrong Skomra
2016-07-13 22:57 ` Greg KH
2016-07-13 22:45 ` [PATCH input-wacom 3/4] backport: Input: wacom_w8001 - ignore invalid pen data packets Aaron Armstrong Skomra
1 sibling, 1 reply; 3+ messages in thread
From: Aaron Armstrong Skomra @ 2016-07-13 22:45 UTC (permalink / raw)
To: linuxwacom-devel, pinglinux, killertofu
Cc: Aaron Armstrong Skomra, Ping Cheng, stable, Dmitry Torokhov,
Jason Gerecke, Aaron Skomra
Somehow the patch that added two-finger touch support forgot to update
W8001_MAX_LENGTH from 11 to 13.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
[jason.gerecke@wacom.com: Imported into input-wacom repository (12afb34)]
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
[aaron.skomra@wacom.com: backported from input-wacom repository (d1906df)]
Signed-off-by: Aaron Skomra <aaron.skomra@wacom.com>
---
2.6.30/wacom_w8001.c | 2 +-
2.6.36/wacom_w8001.c | 2 +-
2.6.38/wacom_w8001.c | 2 +-
3.7/wacom_w8001.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/2.6.30/wacom_w8001.c b/2.6.30/wacom_w8001.c
index 15e401e..134dac5 100755
--- a/2.6.30/wacom_w8001.c
+++ b/2.6.30/wacom_w8001.c
@@ -27,7 +27,7 @@ MODULE_AUTHOR("Jaya Kumar <jayakumar.lkml@gmail.com>");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-#define W8001_MAX_LENGTH 11
+#define W8001_MAX_LENGTH 13
#define W8001_LEAD_MASK 0x80
#define W8001_LEAD_BYTE 0x80
#define W8001_TAB_MASK 0x40
diff --git a/2.6.36/wacom_w8001.c b/2.6.36/wacom_w8001.c
index 03db1de..34414a8 100755
--- a/2.6.36/wacom_w8001.c
+++ b/2.6.36/wacom_w8001.c
@@ -27,7 +27,7 @@ MODULE_AUTHOR("Jaya Kumar <jayakumar.lkml@gmail.com>");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-#define W8001_MAX_LENGTH 11
+#define W8001_MAX_LENGTH 13
#define W8001_LEAD_MASK 0x80
#define W8001_LEAD_BYTE 0x80
#define W8001_TAB_MASK 0x40
diff --git a/2.6.38/wacom_w8001.c b/2.6.38/wacom_w8001.c
index 1a33fad..ed04bb9 100644
--- a/2.6.38/wacom_w8001.c
+++ b/2.6.38/wacom_w8001.c
@@ -27,7 +27,7 @@ MODULE_AUTHOR("Jaya Kumar <jayakumar.lkml@gmail.com>");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-#define W8001_MAX_LENGTH 11
+#define W8001_MAX_LENGTH 13
#define W8001_LEAD_MASK 0x80
#define W8001_LEAD_BYTE 0x80
#define W8001_TAB_MASK 0x40
diff --git a/3.7/wacom_w8001.c b/3.7/wacom_w8001.c
index bab3c6a..b1b4127 100644
--- a/3.7/wacom_w8001.c
+++ b/3.7/wacom_w8001.c
@@ -27,7 +27,7 @@ MODULE_AUTHOR("Jaya Kumar <jayakumar.lkml@gmail.com>");
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-#define W8001_MAX_LENGTH 11
+#define W8001_MAX_LENGTH 13
#define W8001_LEAD_MASK 0x80
#define W8001_LEAD_BYTE 0x80
#define W8001_TAB_MASK 0x40
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH input-wacom 3/4] backport: Input: wacom_w8001 - ignore invalid pen data packets
[not found] <1468449929-17092-1-git-send-email-skomra@gmail.com>
2016-07-13 22:45 ` [PATCH input-wacom 2/4] backport: Input: wacom_w8001 - w8001_MAX_LENGTH should be 13 Aaron Armstrong Skomra
@ 2016-07-13 22:45 ` Aaron Armstrong Skomra
1 sibling, 0 replies; 3+ messages in thread
From: Aaron Armstrong Skomra @ 2016-07-13 22:45 UTC (permalink / raw)
To: linuxwacom-devel, pinglinux, killertofu
Cc: Aaron Armstrong Skomra, Ping Cheng, stable, Dmitry Torokhov,
Jason Gerecke, Aaron Skomra
ThinkPad X60 Tablet PC (pen only device) sometime posts
packets that are larger than W8001_PKTLEN_TPCPEN.
NOTE: The w8001 struct has no touch_dev member in 2.6.36
or 2.6.30.
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>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
[jason.gerecke@wacom.com: Imported into input-wacom repository (9e72ac7)]
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
[aaron.skomra@wacom.com: backported from input-wacom repository (0ae81e81)]
Signed-off-by: Aaron Skomra <aaron.skomra@wacom.com>
---
2.6.38/wacom_w8001.c | 9 +++++++++
3.7/wacom_w8001.c | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/2.6.38/wacom_w8001.c b/2.6.38/wacom_w8001.c
index ed04bb9..de7b8ef 100644
--- a/2.6.38/wacom_w8001.c
+++ b/2.6.38/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;
diff --git a/3.7/wacom_w8001.c b/3.7/wacom_w8001.c
index b1b4127..0c9191c 100644
--- a/3.7/wacom_w8001.c
+++ b/3.7/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;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH input-wacom 2/4] backport: Input: wacom_w8001 - w8001_MAX_LENGTH should be 13
2016-07-13 22:45 ` [PATCH input-wacom 2/4] backport: Input: wacom_w8001 - w8001_MAX_LENGTH should be 13 Aaron Armstrong Skomra
@ 2016-07-13 22:57 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2016-07-13 22:57 UTC (permalink / raw)
To: Aaron Armstrong Skomra
Cc: linuxwacom-devel, pinglinux, killertofu, Ping Cheng, stable,
Dmitry Torokhov, Jason Gerecke, Aaron Skomra
On Wed, Jul 13, 2016 at 03:45:27PM -0700, Aaron Armstrong Skomra wrote:
> Somehow the patch that added two-finger touch support forgot to update
> W8001_MAX_LENGTH from 11 to 13.
>
> Signed-off-by: Ping Cheng <pingc@wacom.com>
> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> [jason.gerecke@wacom.com: Imported into input-wacom repository (12afb34)]
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
> [aaron.skomra@wacom.com: backported from input-wacom repository (d1906df)]
> Signed-off-by: Aaron Skomra <aaron.skomra@wacom.com>
> ---
> 2.6.30/wacom_w8001.c | 2 +-
> 2.6.36/wacom_w8001.c | 2 +-
> 2.6.38/wacom_w8001.c | 2 +-
> 3.7/wacom_w8001.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
Please be more careful with git and prevent it from sending stuff to
people and mailing lists you don't mean to...
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-13 22:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1468449929-17092-1-git-send-email-skomra@gmail.com>
2016-07-13 22:45 ` [PATCH input-wacom 2/4] backport: Input: wacom_w8001 - w8001_MAX_LENGTH should be 13 Aaron Armstrong Skomra
2016-07-13 22:57 ` Greg KH
2016-07-13 22:45 ` [PATCH input-wacom 3/4] backport: Input: wacom_w8001 - ignore invalid pen data packets Aaron Armstrong Skomra
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.