diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 21:25:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 21:25:58 +0200 |
| commit | 7011b7e1b702cc76f9e969b41d9a95969f2aecaa (patch) | |
| tree | d74319f4db45302b6b2ab87b0120eaef6f72a80d | |
| parent | Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor... (diff) | |
| parent | lib/vsprintf: Reinstate printing of legacy clock IDs (diff) | |
| download | linux-7011b7e1b702cc76f9e969b41d9a95969f2aecaa.tar.xz linux-7011b7e1b702cc76f9e969b41d9a95969f2aecaa.zip | |
Merge tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek:
- distinguish different legacy clocks again
- small clean up
* tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
lib/vsprintf: Reinstate printing of legacy clock IDs
vsprintf: fix data type of variable in string_nocheck()
| -rw-r--r-- | lib/vsprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 63937044c57d..b0967cf17137 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -599,7 +599,7 @@ static char *string_nocheck(char *buf, char *end, const char *s, struct printf_spec spec) { int len = 0; - size_t lim = spec.precision; + int lim = spec.precision; while (lim--) { char c = *s++; @@ -1799,7 +1799,7 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec, #ifdef CONFIG_COMMON_CLK return string(buf, end, __clk_get_name(clk), spec); #else - return error_string(buf, end, "(%pC?)", spec); + return ptr_to_id(buf, end, clk, spec); #endif } } |