X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Fmpc52xx_uart.c;h=61dd17d7bacefd0a777ad107dd75869c71b3a319;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=6459edc7f5c5e09d23bef78c590abfe677a5a813;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 6459edc7f..61dd17d7b 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -40,7 +40,7 @@
  * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and
  * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly
  * fpr the console code : without this 1:1 mapping, at early boot time, when we
- * are parsing the kernel args console=ttyPSC?, we wouldn't know which PSC it
+ * are parsing the kernel args console=ttyPSC?, we wouldn't know wich PSC it
  * will be mapped to.
  */
 
@@ -603,14 +603,15 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
 		udelay(1);
 
 	/* Write all the chars */
-	for (i = 0; i < count; i++, s++) {
-		/* Line return handling */
-		if (*s == '\n')
-			out_8(&psc->mpc52xx_psc_buffer_8, '\r');
-		
+	for ( i=0 ; i<count ; i++ ) {
+	
 		/* Send the char */
 		out_8(&psc->mpc52xx_psc_buffer_8, *s);
 
+		/* Line return handling */
+		if ( *s++ == '\n' )
+			out_8(&psc->mpc52xx_psc_buffer_8, '\r');
+		
 		/* Wait the TX buffer to be empty */
 		j = 20000;	/* Maximum wait */	
 		while (!(in_be16(&psc->mpc52xx_psc_status) &