diff --git a/[refs] b/[refs]
index 175a1869a4a7..53f730323fe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aba54da3d05e910199ea8255992c244c9abadd91
+refs/heads/master: 85de3d9bc779c198f8667cffc291b0ecad082b5e
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
index ee4fc50b0b20..a167e1c5d024 100644
--- a/trunk/fs/jffs2/scan.c
+++ b/trunk/fs/jffs2/scan.c
@@ -130,6 +130,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 	if (jffs2_sum_active()) {
 		s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
 		if (!s) {
+			kfree(flashbuf);
 			JFFS2_WARNING("Can't allocate memory for summary\n");
 			return -ENOMEM;
 		}