diff --git a/[refs] b/[refs]
index 31fcf6fc2d92..15ae78f53ecd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2695eab964efaa382168e0351705967bd9deb7ea
+refs/heads/master: 0fed784b0f1ecf57d568ae60b2cada43f9d90759
diff --git a/trunk/fs/jffs2/summary.c b/trunk/fs/jffs2/summary.c
index 6caf1e1ee26d..800171dca53b 100644
--- a/trunk/fs/jffs2/summary.c
+++ b/trunk/fs/jffs2/summary.c
@@ -23,7 +23,7 @@
 
 int jffs2_sum_init(struct jffs2_sb_info *c)
 {
-	uint32_t sum_size = max_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
+	uint32_t sum_size = min_t(uint32_t, c->sector_size, MAX_SUMMARY_SIZE);
 
 	c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);