Re: 2.6.6-rc3-mm2 oops in psmouse/serio after resuming from APM suspend-to-ram

[Dmitry Torokhov <dtor_core@ameritech.net>]

Hi,

On Friday 07 May 2004 03:18 pm, Ari Pollak wrote:
> On a Thinkpad T41 after going into suspend via APM and then resuming, 
> the psmouse driver seems to crash after resetting itself, at which point 
> the PS/2 mouse device (obviously) stops responding and I can't unload 
> the psmouse module. I don't know if this is a new bug or not, as this is 
> the first time I'm trying APM suspend on this laptop. The oops and the 
> kernel messages before it:
> 

I think this should take care of your oops:

===== drivers/input/mouse/psmouse-base.c 1.57 vs edited =====
--- 1.57/drivers/input/mouse/psmouse-base.c	Mon May  3 18:34:11 2004
+++ edited/drivers/input/mouse/psmouse-base.c	Fri May  7 17:12:22 2004
@@ -424,17 +424,17 @@
 		if (set_properties) {
 			psmouse->vendor = "Synaptics";
 			psmouse->name = "TouchPad";
-		}
 
-		if (max_proto > PSMOUSE_IMEX) {
-			if (synaptics_init(psmouse) == 0)
-				return PSMOUSE_SYNAPTICS;
+			if (max_proto > PSMOUSE_IMEX) {
+				if (synaptics_init(psmouse) == 0)
+					return PSMOUSE_SYNAPTICS;
 /*
  * Some Synaptics touchpads can emulate extended protocols (like IMPS/2).
  * Unfortunately Logitech/Genius probes confuse some firmware versions so
  * we'll have to skip them.
  */
-			max_proto = PSMOUSE_IMEX;
+				max_proto = PSMOUSE_IMEX;
+			}
 		}
 /*
  * Make sure that touchpad is in relative mode, gestures (taps) are enabled