From 5853e8c4ea2f9420d7968ec04f1528582f547416 Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Tue, 28 Aug 2012 14:38:05 +0530 Subject: [PATCH] --- yaml --- r: 339580 b: refs/heads/master c: 09aaf994e37c3e37fd2b0e9b1856038e31ae3b68 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/include/mach/uncompress.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5f7d166891c3..685635fd708a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5604f69eec0aed392cea2909ee49dd834b782fac +refs/heads/master: 09aaf994e37c3e37fd2b0e9b1856038e31ae3b68 diff --git a/trunk/arch/arm/mach-davinci/include/mach/uncompress.h b/trunk/arch/arm/mach-davinci/include/mach/uncompress.h index 18cfd4977155..3a0ff905a69b 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/trunk/arch/arm/mach-davinci/include/mach/uncompress.h @@ -32,6 +32,9 @@ u32 *uart; /* PORT_16C550A, in polled non-fifo mode */ static void putc(char c) { + if (!uart) + return; + while (!(uart[UART_LSR] & UART_LSR_THRE)) barrier(); uart[UART_TX] = c; @@ -39,6 +42,9 @@ static void putc(char c) static inline void flush(void) { + if (!uart) + return; + while (!(uart[UART_LSR] & UART_LSR_THRE)) barrier(); }