Skip to content

L
linux
Commit 875d18e9 authored by Russell King's avatar Russell King
Browse files
Options

Merge bk://129.217.163.1/linux-2.5/ 

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-serial
parents fcb7032e c8439f23
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
drivers/serial/serial_core.c
View file @ 875d18e9
...@@ -1707,6 +1707,9 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i) ...@@ -1707,6 +1707,9 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
strcat(stat_buf, "\n"); strcat(stat_buf, "\n");
ret += sprintf(buf + ret, stat_buf); ret += sprintf(buf + ret, stat_buf);
} else {
strcat(buf, "\n");
ret++;
} }
#undef STATBIT #undef STATBIT
#undef INFOBIT #undef INFOBIT
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7