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

From: Ari Pollak
Date: Sat May 08 2004 - 16:35:28 EST


Hm, this patch does work, but it seems to break the synaptics driver for XFree86:

(II) Synaptics touchpad driver version 0.13.0
Configured Mouse no synaptics event device found (checked 5 nodes)
(EE) xf86OpenSerial: No Device specified.
Synaptics driver unable to open device
(EE) PreInit failed for input device "Configured Mouse"
(II) UnloadModule: "synaptics"




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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/