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

[Dmitry Torokhov]

On Saturday 08 May 2004 01:30 pm, Ari Pollak wrote:
> This patch did indeed fix the problem; thanks! Hopefully it will be in 
> the next -mm update.
>

Actually the previous patch is a bad one, I think this one is better:

===================================================================


ChangeSet@xxxxxx, 2004-05-10 00:33:57-05:00, dtor_core@xxxxxxxxxxxxx
  Input: do not call synaptics_init unless we are ready to do full
         mouse setup


 psmouse-base.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


===================================================================



diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c	Mon May 10 00:35:11 2004
+++ b/drivers/input/mouse/psmouse-base.c	Mon May 10 00:35:11 2004
@@ -427,7 +427,7 @@
 		}
 
 		if (max_proto > PSMOUSE_IMEX) {
-			if (synaptics_init(psmouse) == 0)
+			if (!set_properties || synaptics_init(psmouse) == 0)
 				return PSMOUSE_SYNAPTICS;
 /*
  * Some Synaptics touchpads can emulate extended protocols (like IMPS/2).
-
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/