summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-17 15:14:02 -0800
committerTony Lindgren <tony@atomide.com>2010-12-17 15:14:02 -0800
commitfea83f6a9b0a90fefca16ac3534e308f6c34144b (patch)
tree3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /drivers/serial
parentdf127ee375af4cb40b979605e0c336fc79bd38e7 (diff)
parent2d200665c37f544f648d77a05a06ab63328f0d3a (diff)
downloadop-kernel-dev-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip
op-kernel-dev-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.gz
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/kgdboc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
index 3374618..25a8bc5 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)
OpenPOWER on IntegriCloud