summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorZephaniah E. Hull <warp@aehallh.com>2009-05-14 22:02:33 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-15 19:24:18 -0700
commit535650fd7008caffad29f001bcda43f56bafea8e (patch)
treee98a30cc19618cec0e58f263072705ba558ad5c9 /drivers/input/mouse
parent78f7f36711396991431a1d7ceab6103d2c54694c (diff)
downloadlinux-535650fd7008caffad29f001bcda43f56bafea8e.tar.gz
linux-535650fd7008caffad29f001bcda43f56bafea8e.tar.bz2
linux-535650fd7008caffad29f001bcda43f56bafea8e.zip
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>
Diffstat (limited to 'drivers/input/mouse')
-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 f8f86de694bb..b407b355dceb 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -327,7 +327,9 @@ static irqreturn_t psmouse_interrupt(struct serio *serio,
goto out;
}
- if (psmouse->packet[1] == PSMOUSE_RET_ID) {
+ if (psmouse->packet[1] == PSMOUSE_RET_ID ||
+ (psmouse->type == PSMOUSE_HGPK &&
+ psmouse->packet[1] == PSMOUSE_RET_BAT)) {
__psmouse_set_state(psmouse, PSMOUSE_IGNORE);
serio_reconnect(serio);
goto out;