Merge branch 'linus'

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index e2413466ddd5..3af746eaff0e 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -128,17 +128,19 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
         }
 
         if (jffs2_sum_active()) {
-                s = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
+                s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL);
                 if (!s) {
+                        kfree(flashbuf);
                         JFFS2_WARNING("Can't allocate memory for summary\n");
                         return -ENOMEM;
                 }
-                memset(s, 0, sizeof(struct jffs2_summary));
         }
 
         for (i=0; i<c->nr_blocks; i++) {
                 struct jffs2_eraseblock *jeb = &c->blocks[i];
 
+                cond_resched();
+
                 /* reset summary info for next eraseblock scan */
                 jffs2_sum_reset_collected(s);