Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / drivers / serial / serial_imx.c

diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 9b9be44c528d3916b06f28267ec9ad8406befabf..10f7d889a3ad5db0bbdfb76578d8e5794a9bf6d7 100644 (file)
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -1,20 +1,7 @@
 /*
  * (c) 2004 Sascha Hauer <sascha@saschahauer.de>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -194,11 +181,11 @@ static void imx_serial_putc(const char c)
        /* Wait for Tx FIFO not full */
        while (base->uts & UTS_TXFULL);
 
-       base->utxd[0] = c;
-
        /* If \n, also do \r */
        if (c == '\n')
                serial_putc ('\r');
+
+       base->utxd[0] = c;
 }
 
 /*