Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26360
b: refs/heads/master
c: 89c9b48
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Torokhov committed Apr 29, 2006
1 parent a604d9b commit f208897
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b7e394185014e0f3bd8989cac937003f20ef9ce
refs/heads/master: 89c9b4805a525bdd4c6e7529d06292f60ac837fc
4 changes: 3 additions & 1 deletion trunk/drivers/input/mouse/psmouse-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f208897

Please sign in to comment.