Эх сурвалжийг харах

ARM: davinci: uncompress.h: bail out if uart not initialized

Bail out of UART access functions in uncompress.h if the uart
port is not setup. This will happen when booting from DT since
machine type matching does not work in this case. This may also
happen if a correct machine type is not setup by bootloader.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Sekhar Nori 13 жил өмнө
parent
commit
09aaf994e3

+ 6 - 0
arch/arm/mach-davinci/include/mach/uncompress.h

@@ -32,6 +32,9 @@ u32 *uart;
 /* PORT_16C550A, in polled non-fifo mode */
 /* PORT_16C550A, in polled non-fifo mode */
 static void putc(char c)
 static void putc(char c)
 {
 {
+	if (!uart)
+		return;
+
 	while (!(uart[UART_LSR] & UART_LSR_THRE))
 	while (!(uart[UART_LSR] & UART_LSR_THRE))
 		barrier();
 		barrier();
 	uart[UART_TX] = c;
 	uart[UART_TX] = c;
@@ -39,6 +42,9 @@ static void putc(char c)
 
 
 static inline void flush(void)
 static inline void flush(void)
 {
 {
+	if (!uart)
+		return;
+
 	while (!(uart[UART_LSR] & UART_LSR_THRE))
 	while (!(uart[UART_LSR] & UART_LSR_THRE))
 		barrier();
 		barrier();
 }
 }