diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-18 00:14:02 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-18 00:14:02 +0100 |
commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /drivers/serial | |
parent | omap: Fix setting omap_irq_base for 2430 (diff) | |
parent | arm: omap: add minimal support for RM-680 (diff) | |
download | linux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.xz linux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip |
Merge branch 'devel-board' into omap-for-linus
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); static void kgdboc_restore_input(void) { - schedule_work(&kgdboc_restore_input_work); + if (likely(system_state == SYSTEM_RUNNING)) + schedule_work(&kgdboc_restore_input_work); } static int kgdboc_register_kbd(char **cptr) |