2 files changed, 18 insertions, 6 deletions

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 0506934244f0..caac6d63d46f 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -339,14 +339,20 @@ static struct gameport_event *gameport_get_event(void)
         return event;
 }
 
-static void gameport_handle_events(void)
+static void gameport_handle_event(void)
 {
         struct gameport_event *event;
         struct gameport_driver *gameport_drv;
 
         down(&gameport_sem);
 
-        while ((event = gameport_get_event())) {
+        /*
+         * Note that we handle only one event here to give swsusp
+         * a chance to freeze kgameportd thread. Gameport events
+         * should be pretty rare so we are not concerned about
+         * taking performance hit.
+         */
+        if ((event = gameport_get_event())) {
 
                 switch (event->type) {
                         case GAMEPORT_REGISTER_PORT:
@@ -433,7 +439,7 @@ static struct gameport *gameport_get_pending_child(struct gameport *parent)
 static int gameport_thread(void *nothing)
 {
         do {
-                gameport_handle_events();
+                gameport_handle_event();
                 wait_event_interruptible(gameport_wait,
                         kthread_should_stop() || !list_empty(&gameport_event_list));
                 try_to_freeze();
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index edd15db17715..fbb69ef6a77b 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -269,14 +269,20 @@ static struct serio_event *serio_get_event(void)
         return event;
 }
 
-static void serio_handle_events(void)
+static void serio_handle_event(void)
 {
         struct serio_event *event;
         struct serio_driver *serio_drv;
 
         down(&serio_sem);
 
-        while ((event = serio_get_event())) {
+        /*
+         * Note that we handle only one event here to give swsusp
+         * a chance to freeze kseriod thread. Serio events should
+         * be pretty rare so we are not concerned about taking
+         * performance hit.
+         */
+        if ((event = serio_get_event())) {
 
                 switch (event->type) {
                         case SERIO_REGISTER_PORT:
@@ -368,7 +374,7 @@ static struct serio *serio_get_pending_child(struct serio *parent)
 static int serio_thread(void *nothing)
 {
         do {
-                serio_handle_events();
+                serio_handle_event();
                 wait_event_interruptible(serio_wait,
                         kthread_should_stop() || !list_empty(&serio_event_list));
                 try_to_freeze();