diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-17 18:42:30 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-17 18:42:30 -0800 |
commit | 4d1839138220e7e35bf9e31c854e4e0196dea7a1 (patch) | |
tree | a091381c05875e63c6c0eea760f382ef443aa91f /arch/arm | |
parent | 1dc1d2e9485074d5f495beb7771a3ab20eb504e9 (diff) | |
parent | 210dce5faf89c9677ac1a6273bc53f130843539f (diff) | |
download | linux-4d1839138220e7e35bf9e31c854e4e0196dea7a1.tar.gz linux-4d1839138220e7e35bf9e31c854e4e0196dea7a1.tar.bz2 linux-4d1839138220e7e35bf9e31c854e4e0196dea7a1.zip |
Merge tag 'ep93xx-fixes-for-3.8' of git://github.com/RyanMallon/linux-ep93xx into fixes
* tag 'ep93xx-fixes-for-3.8' of git://github.com/RyanMallon/linux-ep93xx:
ARM: ep93xx: properly wait for UART FIFO to be empty
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/uncompress.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index 16026c2b1c8c..d64274fc5760 100644 --- a/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -47,13 +47,9 @@ static void __raw_writel(unsigned int value, unsigned int ptr) static inline void putc(int c) { - int i; - - for (i = 0; i < 1000; i++) { - /* Transmit fifo not full? */ - if (!(__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF)) - break; - } + /* Transmit fifo not full? */ + while (__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF) + ; __raw_writeb(c, PHYS_UART_DATA); } |