[PATCH] serio resume fix

serio - do not attempt to immediately disconnect port if resume failed, let
kseriod take care of it.  Otherwise we may attempt to unregister associated
input devices which will generate hotplug events which are not handled well
during swsusp.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 3313e2daeab022dc1d391ddc19be97bd23b286b7..b28ea33793565891e1a6bed1317c3be7548ba5de 100644 (file)
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -779,7 +779,6 @@ static int serio_resume(struct device *dev)
        struct serio *serio = to_serio_port(dev);
 
        if (!serio->drv || !serio->drv->reconnect || serio->drv->reconnect(serio)) {
-               serio_disconnect_port(serio);
                /*
                 * Driver re-probing can take a while, so better let kseriod
                 * deal with it.