diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 17:35:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 17:35:04 -0500 |
| commit | 3373c3ddb26848beee7b8a96fb98d89533dbf9d7 (patch) | |
| tree | 50e8d87831b21cf0260020f6924034d76fe6ebe1 /drivers/serial | |
| parent | 3907969596091f429b7864cfe4e473a227876a96 (diff) | |
| parent | 8863ada9c47503bb93eba5e3a9ba88e6311db31f (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdboc,input: Fix regression with keyboard release key and early debugging
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/kgdboc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c index 3374618300af..25a8bc565f40 100644 --- a/drivers/serial/kgdboc.c +++ b/drivers/serial/kgdboc.c | |||
| @@ -90,7 +90,8 @@ static DECLARE_WORK(kgdboc_restore_input_work, kgdboc_restore_input_helper); | |||
| 90 | 90 | ||
| 91 | static void kgdboc_restore_input(void) | 91 | static void kgdboc_restore_input(void) |
| 92 | { | 92 | { |
| 93 | schedule_work(&kgdboc_restore_input_work); | 93 | if (likely(system_state == SYSTEM_RUNNING)) |
| 94 | schedule_work(&kgdboc_restore_input_work); | ||
| 94 | } | 95 | } |
| 95 | 96 | ||
| 96 | static int kgdboc_register_kbd(char **cptr) | 97 | static int kgdboc_register_kbd(char **cptr) |