diff options
| author |   Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-05-05 07:11:52 -0300 |
|---|---|---|
| committer |   Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2014-07-28 18:52:06 +0300 |
| commit | 495f2bf6c4ed2da5dcadac96312f71da2a5af949 (patch) | |
| tree | 950867b4504638cbff5532491308a59f619a68c8 /drivers/mtd/ubi | |
| parent | UBIFS: add a log overlap assertion (diff) | |
| download | linux-dev-495f2bf6c4ed2da5dcadac96312f71da2a5af949.tar.xz linux-dev-495f2bf6c4ed2da5dcadac96312f71da2a5af949.zip | |
UBI: block: Make ubiblock_resize return something
Currently, ubiblock_resize() can fail if the device is not found
in the list. This commit changes the return type, so the function can
return something meaningful on error paths.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd/ubi')
| -rw-r--r-- | drivers/mtd/ubi/block.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index 8457df7ec5af..52cefae01887 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -498,7 +498,7 @@ int ubiblock_remove(struct ubi_volume_info *vi) return 0; } -static void ubiblock_resize(struct ubi_volume_info *vi) +static int ubiblock_resize(struct ubi_volume_info *vi) { struct ubiblock *dev; int disk_capacity; @@ -512,7 +512,7 @@ static void ubiblock_resize(struct ubi_volume_info *vi) dev = find_dev_nolock(vi->ubi_num, vi->vol_id); if (!dev) { mutex_unlock(&devices_mutex); - return; + return -ENODEV; } mutex_lock(&dev->dev_mutex); @@ -521,6 +521,7 @@ static void ubiblock_resize(struct ubi_volume_info *vi) ubi_msg("%s resized to %d LEBs", dev->gd->disk_name, vi->size); mutex_unlock(&dev->dev_mutex); mutex_unlock(&devices_mutex); + return 0; } static int ubiblock_notify(struct notifier_block *nb, |