Просмотр исходного кода

[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>
Dmitry Torokhov 20 лет назад
Родитель
Сommit
0c3f2be423
1 измененных файлов с 0 добавлено и 1 удалено
  1. 0 1
      drivers/input/serio/serio.c

+ 0 - 1
drivers/input/serio/serio.c

@@ -779,7 +779,6 @@ static int serio_resume(struct device *dev)
 	struct serio *serio = to_serio_port(dev);
 	struct serio *serio = to_serio_port(dev);
 
 
 	if (!serio->drv || !serio->drv->reconnect || serio->drv->reconnect(serio)) {
 	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
 		 * Driver re-probing can take a while, so better let kseriod
 		 * deal with it.
 		 * deal with it.