X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Fttyprintk.c;h=59366915eee22e9ad7955ff235f09b68940661aa;hb=9b5cc5e057e2e65c035932ff56fd796a6314307f;hp=f22861511909e9f66c366642415368931704974c;hpb=7abec10c623d9e0416dab6919a0ea22e6283516b;p=pandora-kernel.git

diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index f22861511909..59366915eee2 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -17,6 +17,7 @@
 #include <linux/device.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
+#include <linux/export.h>
 
 struct ttyprintk_port {
 	struct tty_port port;
@@ -66,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':