diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-06 14:34:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-06 14:34:29 +0100 |
| commit | b5e4670e1e90fbcf89c2c5aade14fc1615502e16 (patch) | |
| tree | d605227e08cb118bd6574bd169167427847349bd | |
| parent | 7ee5be78773d7b7585f7a7a92248b9a504c6b205 (diff) | |
| parent | a7c958e8721eb2724ee2e2ef13129bc67e1c8a75 (diff) | |
| download | linux-next-b5e4670e1e90fbcf89c2c5aade14fc1615502e16.tar.gz linux-next-b5e4670e1e90fbcf89c2c5aade14fc1615502e16.zip | |
Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git
| -rw-r--r-- | arch/xtensa/include/asm/platform.h | 2 | ||||
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/platform.h b/arch/xtensa/include/asm/platform.h index 94f13fabf7cd..f2e50fc12b4d 100644 --- a/arch/xtensa/include/asm/platform.h +++ b/arch/xtensa/include/asm/platform.h @@ -33,7 +33,7 @@ extern void platform_setup (char **); extern void platform_idle (void); /* - * platform_calibrate_ccount calibrates cpu clock freq (CONFIG_XTENSA_CALIBRATE) + * platform_calibrate_ccount calibrates cpu clock freq (CONFIG_XTENSA_CALIBRATE_CCOUNT) */ extern void platform_calibrate_ccount (void); diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 8b95221375a8..8e54625cb2ba 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -166,8 +166,9 @@ late_initcall(rs_init); static void iss_console_write(struct console *co, const char *s, unsigned count) { - if (s && *s != 0) - simc_write(1, s, min(count, strlen(s))); + count = s ? strnlen(s, count) : 0; + if (count) + simc_write(1, s, count); } static struct tty_driver* iss_console_device(struct console *c, int *index) |