Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346926
b: refs/heads/master
c: 3b11292
h: refs/heads/master
v: v3
  • Loading branch information
Andy Shevchenko authored and Dmitry Torokhov committed Oct 30, 2012
1 parent 2b81549 commit 331fb57
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 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: 53279f36dccffc26ff536003fd6bb97cc21c3b82
refs/heads/master: 3b11292381aa5c57ceb6e089797afdd2e4066085
10 changes: 4 additions & 6 deletions trunk/drivers/input/mouse/alps.c
Original file line number Diff line number Diff line change
Expand Up @@ -767,9 +767,8 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
psmouse->packet[5]) & 0x80) ||
(!alps_is_valid_first_byte(priv->i, psmouse->packet[6]))) {
psmouse_dbg(psmouse,
"refusing packet %x %x %x %x (suspected interleaved ps/2)\n",
psmouse->packet[3], psmouse->packet[4],
psmouse->packet[5], psmouse->packet[6]);
"refusing packet %4ph (suspected interleaved ps/2)\n",
psmouse->packet + 3);
return PSMOUSE_BAD_DATA;
}

Expand Down Expand Up @@ -831,9 +830,8 @@ static void alps_flush_packet(unsigned long data)
psmouse->packet[4] |
psmouse->packet[5]) & 0x80) {
psmouse_dbg(psmouse,
"refusing packet %x %x %x (suspected interleaved ps/2)\n",
psmouse->packet[3], psmouse->packet[4],
psmouse->packet[5]);
"refusing packet %3ph (suspected interleaved ps/2)\n",
psmouse->packet + 3);
} else {
alps_process_packet(psmouse);
}
Expand Down

0 comments on commit 331fb57

Please sign in to comment.