aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2006-04-29 01:12:44 -0400
committerDmitry Torokhov <dtor_core@ameritech.net>2006-04-29 01:12:44 -0400
commit89c9b4805a525bdd4c6e7529d06292f60ac837fc (patch)
treeb3cabcdd8f2626b7c1ff6bab1db18effef34ea27 /drivers
parent7b7e394185014e0f3bd8989cac937003f20ef9ce (diff)
downloadkernel_samsung_smdk4412-89c9b4805a525bdd4c6e7529d06292f60ac837fc.zip
kernel_samsung_smdk4412-89c9b4805a525bdd4c6e7529d06292f60ac837fc.tar.gz
kernel_samsung_smdk4412-89c9b4805a525bdd4c6e7529d06292f60ac837fc.tar.bz2
Input: psmouse - fix new device detection logic
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/mouse/psmouse-base.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 32d70ed..136321a 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);