diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-10-04 10:58:18 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-10-04 10:58:18 +0200 |
| commit | f91ad1217aebdf4cc7b536180ed3528952b47c8d (patch) | |
| tree | 3882b4d8a4d68aeac87f4f676e08ff3e1d5b985f /drivers/mtd | |
| parent | 827efacf9b499b55bebef8112a18333ad0a6ed91 (diff) | |
| parent | 1c7eb28096b50831697a9cf6f8bf1af0e5b234bc (diff) | |
Merge branch 'linux-3.4.y' into tilt-3.4_04Oct_rebase
Conflicts:
drivers/rtc/rtc-twl.c
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/ubi/vtbl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 17cec0c01544..c015fc0a76d8 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -346,7 +346,7 @@ retry: */ err = ubi_scan_add_used(ubi, si, new_seb->pnum, new_seb->ec, vid_hdr, 0); - kfree(new_seb); + kmem_cache_free(si->scan_leb_slab, new_seb); ubi_free_vid_hdr(ubi, vid_hdr); return err; @@ -359,7 +359,7 @@ write_error: list_add(&new_seb->u.list, &si->erase); goto retry; } - kfree(new_seb); + kmem_cache_free(si->scan_leb_slab, new_seb); out_free: ubi_free_vid_hdr(ubi, vid_hdr); return err; |