remove broken wacom patch for 3.14 and 4.4

diff --git a/queue-3.14/input-wacom_w8001-ignore-invalid-pen-data-packets.patch b/queue-3.14/input-wacom_w8001-ignore-invalid-pen-data-packets.patch
deleted file mode 100644 (file)
index 191973c..0000000
--- a/queue-3.14/input-wacom_w8001-ignore-invalid-pen-data-packets.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9e72ac7492149a229ce9039c680849cb682d7092 Mon Sep 17 00:00:00 2001
-From: Ping Cheng <pinglinux@gmail.com>
-Date: Thu, 23 Jun 2016 10:55:11 -0700
-Subject: Input: wacom_w8001 - ignore invalid pen data packets
-
-From: Ping Cheng <pinglinux@gmail.com>
-
-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>
-
----
- drivers/input/touchscreen/wacom_w8001.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/input/touchscreen/wacom_w8001.c
-+++ b/drivers/input/touchscreen/wacom_w8001.c
-@@ -342,6 +342,15 @@ static irqreturn_t w8001_interrupt(struc
-               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/queue-3.14/series b/queue-3.14/series
index 9fb7c9e70305bcc88f0d2ab1beba69e51137c9a3..e96dc3fc397bcc9aa7cdc3fff99259f8ef431d6c 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -5,7 +5,6 @@ alsa-timer-fix-leak-in-sndrv_timer_ioctl_params.patch
 alsa-timer-fix-leak-in-events-via-snd_timer_user_ccallback.patch
 alsa-timer-fix-leak-in-events-via-snd_timer_user_tinterrupt.patch
 input-wacom_w8001-w8001_max_length-should-be-13.patch
-input-wacom_w8001-ignore-invalid-pen-data-packets.patch
 input-xpad-validate-usb-endpoint-count-during-probe.patch
 pinctrl-single-fix-missing-flush-of-posted-write-for-a-wakeirq.patch
 revert-ecryptfs-forbid-opening-files-without-mmap-handler.patch

diff --git a/queue-4.4/input-wacom_w8001-ignore-invalid-pen-data-packets.patch b/queue-4.4/input-wacom_w8001-ignore-invalid-pen-data-packets.patch
deleted file mode 100644 (file)
index 191973c..0000000
--- a/queue-4.4/input-wacom_w8001-ignore-invalid-pen-data-packets.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9e72ac7492149a229ce9039c680849cb682d7092 Mon Sep 17 00:00:00 2001
-From: Ping Cheng <pinglinux@gmail.com>
-Date: Thu, 23 Jun 2016 10:55:11 -0700
-Subject: Input: wacom_w8001 - ignore invalid pen data packets
-
-From: Ping Cheng <pinglinux@gmail.com>
-
-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>
-
----
- drivers/input/touchscreen/wacom_w8001.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/input/touchscreen/wacom_w8001.c
-+++ b/drivers/input/touchscreen/wacom_w8001.c
-@@ -342,6 +342,15 @@ static irqreturn_t w8001_interrupt(struc
-               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/queue-4.4/series b/queue-4.4/series
index 7bcf80944bc7e841057bd055efab7eed6fc22509..43e292f2ee738d7e612449e707f3f3b8f33e3775 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -27,7 +27,6 @@ input-vmmouse-remove-port-reservation.patch
 input-elantech-add-more-ic-body-types-to-the-list.patch
 input-xpad-fix-oops-when-attaching-an-unknown-xbox-one-gamepad.patch
 input-wacom_w8001-w8001_max_length-should-be-13.patch
-input-wacom_w8001-ignore-invalid-pen-data-packets.patch
 input-xpad-validate-usb-endpoint-count-during-probe.patch
 input-tsc200x-report-proper-input_dev-name.patch
 pvclock-add-cpu-barriers-to-get-correct-version-value.patch