diff --git a/[refs] b/[refs]
index 94dbfec0a6a6..deabec85b1ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2aef4d33ac43ec45e4fc2903288030d7f464832
+refs/heads/master: 37ae2d5998aa29d8bf52f124199a21341bc6d18d
diff --git a/trunk/scripts/kconfig/expr.h b/trunk/scripts/kconfig/expr.h
index 80fce57080cc..d4ecce8bc3a6 100644
--- a/trunk/scripts/kconfig/expr.h
+++ b/trunk/scripts/kconfig/expr.h
@@ -10,6 +10,7 @@
 extern "C" {
 #endif
 
+#include <assert.h>
 #include <stdio.h>
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/trunk/scripts/kconfig/lkc.h b/trunk/scripts/kconfig/lkc.h
index b633bdb9f3d4..c18f2bd9c095 100644
--- a/trunk/scripts/kconfig/lkc.h
+++ b/trunk/scripts/kconfig/lkc.h
@@ -90,8 +90,10 @@ struct conf_printer {
 /* confdata.c and expr.c */
 static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
 {
-	if (fwrite(str, len, count, out) < count)
-		fprintf(stderr, "\nError in writing or end of file.\n");
+	assert(len != 0);
+
+	if (fwrite(str, len, count, out) != count)
+		fprintf(stderr, "Error in writing or end of file.\n");
 }
 
 /* menu.c */