From a5bfbb636c779c88cdadd93b19ef3443b766d91e Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 30 May 2006 15:40:36 -0700 Subject: [PATCH] Input psmouse fix, fwd from Daniel Drake --- ...mouse-fix-new-device-detection-logic.patch | 31 +++++++++++++++++++ queue-2.6.16/series | 1 + 2 files changed, 32 insertions(+) create mode 100644 queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch 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 index 00000000000..f1bc29c9fba --- /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 +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 +Cc: Daniel Drake +Signed-off-by: Chris Wright +--- + + 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 c0e75dc1af2..aa58f66102e 100644 --- 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 -- 2.47.2