diff --git a/[refs] b/[refs]
index 29e34780c037..cb4398cff924 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f06fb543c1d0cbd721250b72ee1244178a38aa9d
+refs/heads/master: ee8b593affdf893012e57f4c54a21984d1b0d92e
diff --git a/trunk/drivers/char/ttyprintk.c b/trunk/drivers/char/ttyprintk.c
index 9b1e5e0cdc65..08755c52fc5f 100644
--- a/trunk/drivers/char/ttyprintk.c
+++ b/trunk/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':