diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /drivers/char/hvc_console.c | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/char/hvc_console.c')
| -rw-r--r-- | drivers/char/hvc_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index fa27d1676ee5..3afd62e856eb 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -651,7 +651,7 @@ int hvc_poll(struct hvc_struct *hp) | |||
| 651 | if (sysrq_pressed) | 651 | if (sysrq_pressed) |
| 652 | continue; | 652 | continue; |
| 653 | } else if (sysrq_pressed) { | 653 | } else if (sysrq_pressed) { |
| 654 | handle_sysrq(buf[i], tty); | 654 | handle_sysrq(buf[i]); |
| 655 | sysrq_pressed = 0; | 655 | sysrq_pressed = 0; |
| 656 | continue; | 656 | continue; |
| 657 | } | 657 | } |