aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-05-17 00:53:04 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 10:59:09 -0400
commit0c3f2be423dafb9f914afe85e532e3fffd502fde (patch)
tree5dd44497a960dc4faf078eaa761f42c0766d11b2 /drivers/input
parent135255605d089202bec61b4a000ee762e9bc9d9c (diff)
[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')
-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 3313e2daeab0..b28ea3379356 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -779,7 +779,6 @@ static int serio_resume(struct device *dev)
779 struct serio *serio = to_serio_port(dev); 779 struct serio *serio = to_serio_port(dev);
780 780
781 if (!serio->drv || !serio->drv->reconnect || serio->drv->reconnect(serio)) { 781 if (!serio->drv || !serio->drv->reconnect || serio->drv->reconnect(serio)) {
782 serio_disconnect_port(serio);
783 /* 782 /*
784 * Driver re-probing can take a while, so better let kseriod 783 * Driver re-probing can take a while, so better let kseriod
785 * deal with it. 784 * deal with it.