diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 21:00:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 21:00:22 -0500 |
| commit | d7fe321eeba58f0a37cc4324d10e52092be457e0 (patch) | |
| tree | d77116255f52e5b7b9484b4df41c55126cf06882 /drivers/mtd/ubi/vtbl.c | |
| parent | 4a0d3f3afddf01dfcfdcc826f0b706dbc01f4ef4 (diff) | |
| parent | f7f0283776b6fe33f87f6a2ef15b1feb49ef6dac (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6
* 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6:
UBI: mtd/ubi/vtbl.c: fix memory leak
UBI: fix sparse errors in ubi.h
UBI: fix error message
UBI: silence warning
Diffstat (limited to 'drivers/mtd/ubi/vtbl.c')
| -rw-r--r-- | drivers/mtd/ubi/vtbl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 56fc3fbce838..af36b12be278 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c | |||
| @@ -519,6 +519,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si, | |||
| 519 | if (ubi->autoresize_vol_id != -1) { | 519 | if (ubi->autoresize_vol_id != -1) { |
| 520 | ubi_err("more then one auto-resize volume (%d " | 520 | ubi_err("more then one auto-resize volume (%d " |
| 521 | "and %d)", ubi->autoresize_vol_id, i); | 521 | "and %d)", ubi->autoresize_vol_id, i); |
| 522 | kfree(vol); | ||
| 522 | return -EINVAL; | 523 | return -EINVAL; |
| 523 | } | 524 | } |
| 524 | 525 | ||