Re: [PATCH] psmouse: ESD workaround fix for OLPC XO touchpad

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

Hi Deepak,

On Thu, May 14, 2009 at 01:16:03AM +0000, Deepak Saxena wrote:
> This issue was found during testing back in 2007, before I
> was involved, and the fix has been carried in the OLPC tree 
> since then. Not sure how this would affect other systems so 
> wondering if we should wrap this specific check around 
> '#ifdef OLPC'?
> 

*sigh* Why can't we just implement standard?

I don't like the #ifdef, how about checking protocol type instead?

-- 
Dmitry


Input: psmouse - ESD workaround fix for OLPC XO touchpad

From: Zephaniah E. Hull <warp@aehallh.com>

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>
---

 drivers/input/mouse/psmouse-base.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 4683b13..df31888 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -328,7 +328,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;