aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-05-16 21:53:04 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 07:59:09 -0700
commit0c3f2be423dafb9f914afe85e532e3fffd502fde (patch)
tree5dd44497a960dc4faf078eaa761f42c0766d11b2 /drivers/input/serio
parent135255605d089202bec61b4a000ee762e9bc9d9c (diff)
downloadkernel_samsung_crespo-0c3f2be423dafb9f914afe85e532e3fffd502fde.zip
kernel_samsung_crespo-0c3f2be423dafb9f914afe85e532e3fffd502fde.tar.gz
kernel_samsung_crespo-0c3f2be423dafb9f914afe85e532e3fffd502fde.tar.bz2
[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>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/serio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 3313e2d..b28ea33 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.