Commit 7011b7e1 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 9d22167f 4ca96aa9
...@@ -599,7 +599,7 @@ static char *string_nocheck(char *buf, char *end, const char *s, ...@@ -599,7 +599,7 @@ static char *string_nocheck(char *buf, char *end, const char *s,
struct printf_spec spec) struct printf_spec spec)
{ {
int len = 0; int len = 0;
size_t lim = spec.precision; int lim = spec.precision;
while (lim--) { while (lim--) {
char c = *s++; char c = *s++;
...@@ -1799,7 +1799,7 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec, ...@@ -1799,7 +1799,7 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
#ifdef CONFIG_COMMON_CLK #ifdef CONFIG_COMMON_CLK
return string(buf, end, __clk_get_name(clk), spec); return string(buf, end, __clk_get_name(clk), spec);
#else #else
return error_string(buf, end, "(%pC?)", spec); return ptr_to_id(buf, end, clk, spec);
#endif #endif
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment