diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-10-08 20:04:37 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-08 20:04:37 -0400 |
| commit | 629e813c861738d433a3f3bacee346c8b356104f (patch) | |
| tree | a317dd9ceaa4185e752b2ecf3204015b2c6621ea /drivers/char | |
| parent | 16f7c2da31596d7b61e29ee6df2f89ed69a7ecf7 (diff) | |
| parent | 399abb8918aa5cef74a1d5c582bc7c08c8c99757 (diff) | |
Merge tag 'v3.4.13' into v3.4-rt
This is the 3.4.13 stable release
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/ttyprintk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index 46b77ede84c0..a7c6d6a07d3c 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c @@ -67,7 +67,7 @@ static int tpk_printk(const unsigned char *buf, int count) tmp[tpk_curr + 1] = '\0'; printk(KERN_INFO "%s%s", tpk_tag, tmp); tpk_curr = 0; - if (buf[i + 1] == '\n') + if ((i + 1) < count && buf[i + 1] == '\n') i++; break; case '\n': |