3 files changed, 3 insertions, 6 deletions

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 20896d5e5f0..ec1b6cfefcd 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -448,9 +448,8 @@ static int gameport_thread(void *nothing)
         set_freezable();
         do {
                 gameport_handle_event();
-                wait_event_interruptible(gameport_wait,
+                wait_event_freezable(gameport_wait,
                         kthread_should_stop() || !list_empty(&gameport_event_list));
-                try_to_freeze();
         } while (!kthread_should_stop());
 
         printk(KERN_DEBUG "gameport: kgameportd exiting\n");
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index b3bc15acd3f..7f5293828fb 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -387,9 +387,8 @@ static int serio_thread(void *nothing)
         set_freezable();
         do {
                 serio_handle_event();
-                wait_event_interruptible(serio_wait,
+                wait_event_freezable(serio_wait,
                         kthread_should_stop() || !list_empty(&serio_event_list));
-                try_to_freeze();
         } while (!kthread_should_stop());
 
         printk(KERN_DEBUG "serio: kseriod exiting\n");
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 86aed64ec0f..89373b01d8f 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -333,10 +333,9 @@ static int ucb1400_ts_thread(void *_ucb)
                         timeout = msecs_to_jiffies(10);
                 }
 
-                wait_event_interruptible_timeout(ucb->ts_wait,
+                wait_event_freezable_timeout(ucb->ts_wait,
                         ucb->irq_pending || ucb->ts_restart || kthread_should_stop(),
                         timeout);
-                try_to_freeze();
         }
 
         /* Send the "pen off" if we are stopping with the pen still active */