diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
commit | 39c6c3480a9cb88e722af1142c7b31a00e9ec546 (patch) | |
tree | 3381f97f7485a14df8f2c47249d1aedfa509d205 /common/console_common.c | |
parent | ff6383c8e4bde31036fbd31f7961539be288d6af (diff) | |
parent | bdcdcaad8199aba9774197e6f3296f659d30c399 (diff) | |
download | barebox-39c6c3480a9cb88e722af1142c7b31a00e9ec546.tar.gz barebox-39c6c3480a9cb88e722af1142c7b31a00e9ec546.tar.xz |
Merge branch 'for-next/mxs'
Diffstat (limited to 'common/console_common.c')
-rw-r--r-- | common/console_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/console_common.c b/common/console_common.c index cc25f97d9d..df1b085982 100644 --- a/common/console_common.c +++ b/common/console_common.c @@ -101,7 +101,7 @@ void pr_puts(int level, const char *str) { struct log_entry *log; - if (IS_ENABLED(CONFIG_LOGBUF)) { + if (IS_ENABLED(CONFIG_LOGBUF) && mem_malloc_is_initialized()) { if (barebox_log_max_messages > 0) log_clean(barebox_log_max_messages - 1); |