diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 20:25:31 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 20:25:31 +0400 |
| commit | 7e61b3ff50f59f134054aaf43096c761fafecf0c (patch) | |
| tree | f592c876b8c8c3e8b9ba69dd2bd49f57412f6a6e /drivers/mtd/ubi/build.c | |
| parent | 6e55f8ed814940b0b7420ed633c08e61702bb8d4 (diff) | |
| parent | cc831464f839dc2559f896b96d13eaa0366282b0 (diff) | |
| download | linux-7e61b3ff50f59f134054aaf43096c761fafecf0c.tar.xz | |
Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi
Pull UBI changes from Artem Bityutskiy:
- Reduce memory consumption
- Fix picking unknown blocks
- Fix error-path in 'ubi_scan()'
- Minor clean-ups
* tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi:
UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS
UBI: rename peb_buf1 to peb_buf
UBI: reduce memory consumption
UBI: fix eraseblock picking criteria
UBI: fix documentation and improve readability
UBI: fix error handling in ubi_scan()
Diffstat (limited to 'drivers/mtd/ubi/build.c')
| -rw-r--r-- | drivers/mtd/ubi/build.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 115749f20f9e..0fde9fc7d2e5 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -945,12 +945,8 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) goto out_free; err = -ENOMEM; - ubi->peb_buf1 = vmalloc(ubi->peb_size); - if (!ubi->peb_buf1) - goto out_free; - - ubi->peb_buf2 = vmalloc(ubi->peb_size); - if (!ubi->peb_buf2) + ubi->peb_buf = vmalloc(ubi->peb_size); + if (!ubi->peb_buf) goto out_free; err = ubi_debugging_init_dev(ubi); @@ -1029,8 +1025,7 @@ out_detach: out_debugging: ubi_debugging_exit_dev(ubi); out_free: - vfree(ubi->peb_buf1); - vfree(ubi->peb_buf2); + vfree(ubi->peb_buf); if (ref) put_device(&ubi->dev); else @@ -1101,8 +1096,7 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway) vfree(ubi->vtbl); put_mtd_device(ubi->mtd); ubi_debugging_exit_dev(ubi); - vfree(ubi->peb_buf1); - vfree(ubi->peb_buf2); + vfree(ubi->peb_buf); ubi_msg("mtd%d is detached from ubi%d", ubi->mtd->index, ubi->ubi_num); put_device(&ubi->dev); return 0; |