mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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
This commit is contained in:
commit
5c5d4e8eaf
8 changed files with 38 additions and 28 deletions
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue