From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Tue, 17 May 2005 04:53:04 +0000 (-0700)
Subject: [PATCH] serio resume fix
X-Git-Tag: v2.6.12-rc5~169
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c3f2be423dafb9f914afe85e532e3fffd502fde;p=linux-2.6

[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 3313e2daea..b28ea33793 100644
--- 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.