Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 05:54:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove broken assertion in console_putc()

Browse source 
The assertion in console_putc() would trigger a recursion that
exhausts the stack and eventually aborts.

This patch replaces the assertion with an error return if the
console has not been initialized yet.

Fixes ARM-software/tf-issues#208

Change-Id: I95f736ff215d69655eb5ba7ceac70dc1409d986a
This commit is contained in:
Andrew Thoelke 2014-06-20 11:12:39 +01:00
parent dbc64b39c9
commit 0695dc49e2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/arm/pl011/pl011_console.c
View file

@ -71,7 +71,12 @@ void console_init(unsigned long base_addr)
int console_putc(int c) int console_putc(int c)
{ {
assert(uart_base); /* If the console has not been initialized then return an error
* code. Asserting here would result in recursion and stack
* exhaustion
*/
if (!uart_base)
return -1;
if (c == '\n') { if (c == '\n') {
WAIT_UNTIL_UART_FREE(uart_base); WAIT_UNTIL_UART_FREE(uart_base);