Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: psmouse - ESD workaround fix for OLPC XO touchpad

It appears that when the XO touchpad unit resets from ESD, it sends AA
AA instead of AA 00, the psmouse-base code handles the case of AA 00 by
triggering a serio reconnect for the port, causing a full reprobe of
the device.

Testing with OFW shows that this is likely to solve the problem, so
the attached patch simply expands the existing test to also catch AA AA.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Zephaniah E. Hull and committed by
Dmitry Torokhov
535650fd 78f7f367

+3 -1
+3 -1
drivers/input/mouse/psmouse-base.c
··· 327 327 goto out; 328 328 } 329 329 330 - if (psmouse->packet[1] == PSMOUSE_RET_ID) { 330 + if (psmouse->packet[1] == PSMOUSE_RET_ID || 331 + (psmouse->type == PSMOUSE_HGPK && 332 + psmouse->packet[1] == PSMOUSE_RET_BAT)) { 331 333 __psmouse_set_state(psmouse, PSMOUSE_IGNORE); 332 334 serio_reconnect(serio); 333 335 goto out;