Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022624a7 authored by Zhaolei's avatar Zhaolei Committed by Ingo Molnar
Browse files

printk: fix wrong format string iter for printk 



printk("%Q");

 Output before patch:  %QQ
 Output  after patch:  %Q

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: torvalds@linux-foundation.org
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <49CC97B6.7040809@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ff96e612

lib/vsprintf.c

+0 −16
Original line number Diff line number Diff line
@@ -1051,13 +1051,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) 
			if (str < end)

				*str = '%';

			++str;

			if (*fmt) {

				if (str < end)

					*str = *fmt;

				++str;

			} else {

				--fmt;

			}

			break;



		case FORMAT_TYPE_NRCHARS: {
@@ -1339,8 +1332,6 @@ do { \ 
			break;



		case FORMAT_TYPE_INVALID:

			if (!*fmt)

				--fmt;

			break;



		case FORMAT_TYPE_NRCHARS: {
@@ -1523,13 +1514,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) 
			if (str < end)

				*str = '%';

			++str;

			if (*fmt) {

				if (str < end)

					*str = *fmt;

				++str;

			} else {

				--fmt;

			}

			break;



		case FORMAT_TYPE_NRCHARS: