Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / log.h

diff --git a/include/log.h b/include/log.h
index 3e99d6e62b69db48976cc7d3f8f09ae6104f5314..653fb8d853ec77ca96283f2f3f2487185ff55f12 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -166,8 +166,16 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
                log(LOG_CATEGORY, LOGL_ERR, "returning err=%d\n", __ret); \
        __ret; \
        })
+#define log_msg_ret(_msg, _ret) ({ \
+       int __ret = (_ret); \
+       if (__ret < 0) \
+               log(LOG_CATEGORY, LOGL_ERR, "%s: returning err=%d\n", _msg, \
+                   __ret); \
+       __ret; \
+       })
 #else
 #define log_ret(_ret) (_ret)
+#define log_msg_ret(_ret) (_ret)
 #endif
 
 /**