Input psmouse fix, fwd from Daniel Drake

diff --git a/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch b/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch
new file mode 100644 (file)
index 0000000..f1bc29c
--- /dev/null
+++ b/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch
@@ -0,0 +1,31 @@
+From dtor_core@ameritech.net  Tue May 30 15:33:17 2006
+From: Dmitry Torokhov <dtor_core@ameritech.net>
+Date: Sat, 29 Apr 2006 05:12:44 +0000 (-0400)
+Subject: Input: psmouse - fix new device detection logic
+
+Input: psmouse - fix new device detection logic
+
+Reported to fix http://bugs.gentoo.org/130846
+
+Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
+Cc: Daniel Drake <dsd@gentoo.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ drivers/input/mouse/psmouse-base.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- linux-2.6.16.18.orig/drivers/input/mouse/psmouse-base.c
++++ linux-2.6.16.18/drivers/input/mouse/psmouse-base.c
+@@ -300,8 +300,10 @@ static irqreturn_t psmouse_interrupt(str
+  * Check if this is a new device announcement (0xAA 0x00)
+  */
+       if (unlikely(psmouse->packet[0] == PSMOUSE_RET_BAT && psmouse->pktcnt <= 2)) {
+-              if (psmouse->pktcnt == 1)
++              if (psmouse->pktcnt == 1) {
++                      psmouse->last = jiffies;
+                       goto out;
++              }
+ 
+               if (psmouse->packet[1] == PSMOUSE_RET_ID) {
+                       __psmouse_set_state(psmouse, PSMOUSE_IGNORE);

diff --git a/queue-2.6.16/series b/queue-2.6.16/series
index c0e75dc1af25491925c91d27681b49e2c0c438c9..aa58f66102eceb967e54a5e1d9717dabd1f33e81 100644 (file)
--- a/queue-2.6.16/series
+++ b/queue-2.6.16/series
@@ -2,3 +2,4 @@ altix-correct-ioc4-port-order.patch
 altix-correct-ioc3-port-order.patch
 cpuset-might-sleep-checking-zones-allowed-fix.patch
 powermac-force-only-suspend-to-disk-to-be-valid.patch
+input-psmouse-fix-new-device-detection-logic.patch