diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
| commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
| tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /drivers/input | |
| parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
| parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/gameport/gameport.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/serio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index e152d0fa0cdd..c77a82e46055 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c | |||
| @@ -439,7 +439,7 @@ static int gameport_thread(void *nothing) | |||
| 439 | do { | 439 | do { |
| 440 | gameport_handle_events(); | 440 | gameport_handle_events(); |
| 441 | wait_event_interruptible(gameport_wait, !list_empty(&gameport_event_list)); | 441 | wait_event_interruptible(gameport_wait, !list_empty(&gameport_event_list)); |
| 442 | try_to_freeze(PF_FREEZE); | 442 | try_to_freeze(); |
| 443 | } while (!signal_pending(current)); | 443 | } while (!signal_pending(current)); |
| 444 | 444 | ||
| 445 | printk(KERN_DEBUG "gameport: kgameportd exiting\n"); | 445 | printk(KERN_DEBUG "gameport: kgameportd exiting\n"); |
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index feab4970406e..341824c48529 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c | |||
| @@ -344,7 +344,7 @@ static int serio_thread(void *nothing) | |||
| 344 | do { | 344 | do { |
| 345 | serio_handle_events(); | 345 | serio_handle_events(); |
| 346 | wait_event_interruptible(serio_wait, !list_empty(&serio_event_list)); | 346 | wait_event_interruptible(serio_wait, !list_empty(&serio_event_list)); |
| 347 | try_to_freeze(PF_FREEZE); | 347 | try_to_freeze(); |
| 348 | } while (!signal_pending(current)); | 348 | } while (!signal_pending(current)); |
| 349 | 349 | ||
| 350 | printk(KERN_DEBUG "serio: kseriod exiting\n"); | 350 | printk(KERN_DEBUG "serio: kseriod exiting\n"); |