diff options
Diffstat (limited to 'drivers/tty/serial/altera_uart.c')
-rw-r--r-- | drivers/tty/serial/altera_uart.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c index 4c1eae93110c..6a243239dbef 100644 --- a/drivers/tty/serial/altera_uart.c +++ b/drivers/tty/serial/altera_uart.c | |||
@@ -430,7 +430,7 @@ static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS]; | |||
430 | 430 | ||
431 | #if defined(CONFIG_SERIAL_ALTERA_UART_CONSOLE) | 431 | #if defined(CONFIG_SERIAL_ALTERA_UART_CONSOLE) |
432 | 432 | ||
433 | static void altera_uart_console_putc(struct uart_port *port, const char c) | 433 | static void altera_uart_console_putc(struct uart_port *port, int c) |
434 | { | 434 | { |
435 | while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) & | 435 | while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) & |
436 | ALTERA_UART_STATUS_TRDY_MSK)) | 436 | ALTERA_UART_STATUS_TRDY_MSK)) |
@@ -444,11 +444,7 @@ static void altera_uart_console_write(struct console *co, const char *s, | |||
444 | { | 444 | { |
445 | struct uart_port *port = &(altera_uart_ports + co->index)->port; | 445 | struct uart_port *port = &(altera_uart_ports + co->index)->port; |
446 | 446 | ||
447 | for (; count; count--, s++) { | 447 | uart_console_write(port, s, count, altera_uart_console_putc); |
448 | altera_uart_console_putc(port, *s); | ||
449 | if (*s == '\n') | ||
450 | altera_uart_console_putc(port, '\r'); | ||
451 | } | ||
452 | } | 448 | } |
453 | 449 | ||
454 | static int __init altera_uart_console_setup(struct console *co, char *options) | 450 | static int __init altera_uart_console_setup(struct console *co, char *options) |