From b94594f89358309f337a858c7f7db1b9547275f0 Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@gmail.com>
Date: Mon, 15 May 2006 23:42:31 +0100
Subject: [PATCH] --- yaml --- r: 27779 b: refs/heads/master c:
 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce h: refs/heads/master i:   27777:
 1cd6f07b1d2c357ce558b2288a66e045284248fd   27775:
 c068fc7409f3fb1a533ac3dc34f56643911e5f07 v: v3

---
 [refs]                | 2 +-
 trunk/fs/jffs2/scan.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6fb157c2e9c1..4db9f292d992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 184f565210c6c8a852c53ffc070f9add61e0f331
+refs/heads/master: 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
index cf55b221fc2b..eca0996def60 100644
--- a/trunk/fs/jffs2/scan.c
+++ b/trunk/fs/jffs2/scan.c
@@ -222,9 +222,6 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 		}
 	}
 
-	if (jffs2_sum_active() && s)
-		kfree(s);
-
 	/* Nextblock dirty is always seen as wasted, because we cannot recycle it now */
 	if (c->nextblock && (c->nextblock->dirty_size)) {
 		c->nextblock->wasted_size += c->nextblock->dirty_size;
@@ -266,6 +263,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 	else
 		c->mtd->unpoint(c->mtd, flashbuf, 0, c->mtd->size);
 #endif
+	if (s)
+		kfree(s);
+
 	return ret;
 }