diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 10:27:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 10:27:24 -0700 |
| commit | cdf4a6482dd4c739f8c1132c5a9356912911fec5 (patch) | |
| tree | fa7b67c8ef5723d88cdc400f90a9b6e927e159a5 /drivers/mtd/ubi/misc.c | |
| parent | 485cf925d8b7a6b3c62fe5f1e167f2d0d4edf32a (diff) | |
| parent | add0b43ca67bf281ef7ac8ab47e9ee7b2d97a69f (diff) | |
Merge branch 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6
* 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6: (28 commits)
UBI: fix compile warning
UBI: fix error handling in erase worker
UBI: fix comments
UBI: remove unneeded error checks
UBI: cleanup usage of try_module_get
UBI: fix overflow bug
UBI: bugfix in max_sqnum calculation
UBI: bugfix in sqnum calculation
UBI: fix signed-unsigned multiplication
UBI: fix bug in atomic_leb_change()
UBI: fix message
UBI: fix debugging stuff
UBI: bugfix in error path
UBI: use is_power_of_2()
UBI: fix freeing ubi->vtbl while unloading
UBI: fix MAINTAINERS
UBI: bugfix in ubi_leb_change()
UBI: kill homegrown endian macros
UBI: cleanup ioctl handling
UBI: error path bugfix
...
Diffstat (limited to 'drivers/mtd/ubi/misc.c')
| -rw-r--r-- | drivers/mtd/ubi/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c index 38d4e6757dc..9e2338c8e2c 100644 --- a/drivers/mtd/ubi/misc.c +++ b/drivers/mtd/ubi/misc.c @@ -67,7 +67,7 @@ int ubi_check_volume(struct ubi_device *ubi, int vol_id) if (vol->vol_type != UBI_STATIC_VOLUME) return 0; - buf = kmalloc(vol->usable_leb_size, GFP_KERNEL); + buf = vmalloc(vol->usable_leb_size); if (!buf) return -ENOMEM; @@ -87,7 +87,7 @@ int ubi_check_volume(struct ubi_device *ubi, int vol_id) } } - kfree(buf); + vfree(buf); return err; } |