diff options
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 22 | 
1 files changed, 10 insertions, 12 deletions
| diff --git a/lib/vsprintf.c b/lib/vsprintf.c index d5b3a3f95c01..376de10929b3 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1833,17 +1833,15 @@ static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec)   *       p page flags (see struct page) given as pointer to unsigned long   *       g gfp flags (GFP_* and __GFP_*) given as pointer to gfp_t   *       v vma flags (VM_*) given as pointer to unsigned long - * - 'O' For a kobject based struct. Must be one of the following: - *       - 'OF[fnpPcCF]'  For a device tree object - *                        Without any optional arguments prints the full_name - *                        f device node full_name - *                        n device node name - *                        p device node phandle - *                        P device node path spec (name + @unit) - *                        F device node flags - *                        c major compatible string - *                        C full compatible string - * + * - 'OF[fnpPcCF]'  For a device tree object + *                  Without any optional arguments prints the full_name + *                  f device node full_name + *                  n device node name + *                  p device node phandle + *                  P device node path spec (name + @unit) + *                  F device node flags + *                  c major compatible string + *                  C full compatible string   * - 'x' For printing the address. Equivalent to "%lx".   *   * ** When making changes please also update: @@ -2794,7 +2792,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)  						copy = end - str;  					memcpy(str, args, copy);  					str += len; -					args += len; +					args += len + 1;  				}  			}  			if (process) |