Skip to content

Commit

Permalink
Input: serio - do not mark kseriod freezable anymore
Browse files Browse the repository at this point in the history
We used to make kseriod freezable to prevent unnecessary attempts at
resuming keyboard and mouse before taking hibernation image when suspend
and hibernation were sharing PM operations. Now that they are separated
and we don't risk resuming during 'thaw' we don't need to freeze kseriod
anymore. This will allow us to start resetting mouse and keyboard a bit
earlier, before rest of the userspace comes back up.

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Dec 25, 2009
1 parent 4a299bf commit ea486e6
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/input/serio/serio.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,7 @@ static void serio_handle_event(void)

mutex_lock(&serio_mutex);

/*
* 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())) {
while ((event = serio_get_event())) {

switch (event->type) {
case SERIO_REGISTER_PORT:
Expand Down Expand Up @@ -380,10 +374,9 @@ static struct serio *serio_get_pending_child(struct serio *parent)

static int serio_thread(void *nothing)
{
set_freezable();
do {
serio_handle_event();
wait_event_freezable(serio_wait,
wait_event_interruptible(serio_wait,
kthread_should_stop() || !list_empty(&serio_event_list));
} while (!kthread_should_stop());

Expand Down

0 comments on commit ea486e6

Please sign in to comment.