diff --git a/[refs] b/[refs]
index a8cc8393c94b..7d3cee6f2057 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e638275e18a929103bb087acb94d2b67eb0818e0
+refs/heads/master: e8a0e41266e9c207ad8ac158cee9547ef1bc90ac
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
index 8d8cd3419d02..28107ca136e4 100644
--- a/trunk/fs/jffs2/scan.c
+++ b/trunk/fs/jffs2/scan.c
@@ -275,9 +275,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 	else
 		c->mtd->unpoint(c->mtd, 0, c->mtd->size);
 #endif
-	if (s)
-		kfree(s);
-
+	kfree(s);
 	return ret;
 }