Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / drivers / w1 / w1_log.h

diff --git a/drivers/w1/w1_log.h b/drivers/w1/w1_log.h
index 9c7bd62..f9eecff 100644 (file)
--- a/drivers/w1/w1_log.h
+++ b/drivers/w1/w1_log.h
@@ -29,8 +29,8 @@
 #else
 #  define assert(expr) \
         if(unlikely(!(expr))) {                                        \
-        printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",        \
-       #expr, __FILE__, __func__, __LINE__);                   \
+               pr_err("Assertion failed! %s,%s,%s,line=%d\n",  \
+               #expr, __FILE__, __func__, __LINE__);           \
         }
 #endif