Skip to content

Commit

Permalink
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Dec 14, 2010
2 parents 3907969 + 8863ada commit 3373c3d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/serial/kgdboc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3373c3d

Please sign in to comment.