Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb

3373c3dd · Linus Torvalds <[email protected]> · 2010-12-14 14:35:04 -08:00

* '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

Commit: 3373c3ddb26848beee7b8a96fb98d89533dbf9d7
Parents: 39079695 · 8863ada9

Merge commit. Changes below are compared with the first parent: 39079695.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
drivers/serial/kgdboc.c	modified	+2	−1	View file

drivers/serial/kgdboc.c

View file

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)