diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-01 20:25:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-01 20:25:46 +0200 |
| commit | 5c5d4e8eafd0e54c2134c23296b1d7996c304fe1 (patch) | |
| tree | e994f543ad768eaa6736577b87989d56183b19e9 /fs/jffs2 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz... (diff) | |
| parent | mtd: nand: fix build failure and incorrect return from omap_wait() (diff) | |
| download | linux-5c5d4e8eafd0e54c2134c23296b1d7996c304fe1.tar.xz linux-5c5d4e8eafd0e54c2134c23296b1d7996c304fe1.zip | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
mtd: nand: fix build failure and incorrect return from omap_wait()
mtd: Use BLOCK_NIL consistently in NFTL/INFTL
mtd: m25p80 timeout too short for worst-case m25p16 devices
mtd: atmel_nand: Fix typo s/parititions/partitions/
mtd: cmdlineparts: Use 64-bit format when printing a debug message.
mtd: maps: Remove BUS_ID_SIZE from integrator_flash
jffs2: fix another potential leak on error path in scan.c
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 7515e73e2bfb..696686cc206e 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -130,9 +130,9 @@ 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; + ret = -ENOMEM; + goto out; } } |