diff --git a/[refs] b/[refs]
index 2b82b45d12b1..acbb3b964aed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa6c220a7f01257b1c2c4203d48aaaedb0c4416f
+refs/heads/master: d882687c51b52424a56992578ce7636b3f3c8d41
diff --git a/trunk/fs/jffs2/summary.c b/trunk/fs/jffs2/summary.c
index c19bd476e8ec..e52cef526d90 100644
--- a/trunk/fs/jffs2/summary.c
+++ b/trunk/fs/jffs2/summary.c
@@ -252,6 +252,11 @@ int jffs2_sum_add_kvec(struct jffs2_sb_info *c, const struct kvec *invecs,
 	union jffs2_node_union *node;
 	struct jffs2_eraseblock *jeb;
 
+	if (c->summary->sum_size == JFFS2_SUMMARY_NOSUM_SIZE) {
+		dbg_summary("Summary is disabled for this jeb! Skipping summary info!\n");
+		return 0;
+	}
+
 	node = invecs[0].iov_base;
 	jeb = &c->blocks[ofs / c->sector_size];
 	ofs -= jeb->offset;