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
X-Git-Tag: v2.6.17-rc4~103^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=89c9b4805a525bdd4c6e7529d06292f60ac837fc;p=linux-2.6-omap-h63xx.git

Input: psmouse - fix new device detection logic

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 32d70ed8f41..136321a2cfd 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -302,8 +302,10 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
  * 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);