diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 18:09:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 18:09:29 +0100 |
| commit | 96c3d0c2555e1b97c57348e83702f3b56b8df9d3 (patch) | |
| tree | a6d7c08fa5cbc949a63cec98592c7a7ec19d2edf | |
| parent | 6a2f8c339e219a7e4d9939f54c9bba8625c5fa58 (diff) | |
| parent | 84477867e122251b8c47db240a8d699b0836aa6f (diff) | |
| download | linux-next-history-96c3d0c2555e1b97c57348e83702f3b56b8df9d3.tar.gz | |
Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 8b95221375a89..8e54625cb2ba1 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) |