diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:33:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:33:12 -0800 |
| commit | 9d8f057acbd38d8177cf2ffd5e151d52c2477372 (patch) | |
| tree | 1c3387b045a8a487ff99bf3abed1cdf41670f6e6 /drivers/serial/mpc52xx_uart.c | |
| parent | 591eb85ecd7e6eb8596c6129ae074e16636b99f4 (diff) | |
| parent | 91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06 (diff) | |
| download | talos-op-linux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.tar.gz talos-op-linux-9d8f057acbd38d8177cf2ffd5e151d52c2477372.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Merge avlab serial board entries in parport_serial
[SERIAL] kernel console should send CRLF not LFCR
Diffstat (limited to 'drivers/serial/mpc52xx_uart.c')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 61dd17d7bace..928e6cf12dca 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -603,15 +603,14 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count) udelay(1); /* Write all the chars */ - for ( i=0 ; i<count ; i++ ) { - - /* Send the char */ - out_8(&psc->mpc52xx_psc_buffer_8, *s); - + for (i = 0; i < count; i++, s++) { /* Line return handling */ - if ( *s++ == '\n' ) + if (*s == '\n') out_8(&psc->mpc52xx_psc_buffer_8, '\r'); + /* Send the char */ + out_8(&psc->mpc52xx_psc_buffer_8, *s); + /* Wait the TX buffer to be empty */ j = 20000; /* Maximum wait */ while (!(in_be16(&psc->mpc52xx_psc_status) & |
