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/kapi.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/kapi.c')
| -rw-r--r-- | drivers/mtd/ubi/kapi.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c index d352c4575c3..4a458e83e4e 100644 --- a/drivers/mtd/ubi/kapi.c +++ b/drivers/mtd/ubi/kapi.c @@ -37,14 +37,9 @@ int ubi_get_device_info(int ubi_num, struct ubi_device_info *di) { const struct ubi_device *ubi; - if (!try_module_get(THIS_MODULE)) - return -ENODEV; - if (ubi_num < 0 || ubi_num >= UBI_MAX_DEVICES || - !ubi_devices[ubi_num]) { - module_put(THIS_MODULE); + !ubi_devices[ubi_num]) return -ENODEV; - } ubi = ubi_devices[ubi_num]; di->ubi_num = ubi->ubi_num; @@ -52,7 +47,6 @@ int ubi_get_device_info(int ubi_num, struct ubi_device_info *di) di->min_io_size = ubi->min_io_size; di->ro_mode = ubi->ro_mode; di->cdev = MKDEV(ubi->major, 0); - module_put(THIS_MODULE); return 0; } EXPORT_SYMBOL_GPL(ubi_get_device_info); @@ -319,9 +313,14 @@ int ubi_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset, offset + len > vol->usable_leb_size) return -EINVAL; - if (vol->vol_type == UBI_STATIC_VOLUME && lnum == vol->used_ebs - 1 && - offset + len > vol->last_eb_bytes) - return -EINVAL; + if (vol->vol_type == UBI_STATIC_VOLUME) { + if (vol->used_ebs == 0) + /* Empty static UBI volume */ + return 0; + if (lnum == vol->used_ebs - 1 && + offset + len > vol->last_eb_bytes) + return -EINVAL; + } if (vol->upd_marker) return -EBADF; |