Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 0 insertions, 16 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index be3001f912e4..7536acea135b 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -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: