summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/vmt.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-02 10:41:40 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-02 10:41:40 +0200
commita3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch)
tree648bbeea304950d02e71863673be8154a5e491f6 /drivers/mtd/ubi/vmt.c
parentc2de187e5b0f25b572ac1cb6cdf383f16123717d (diff)
parentebb47241ea0eac6a5a23404821a2d62f64c68496 (diff)
downloadlinux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz
linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.bz2
linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/mtd/ubi/vmt.c')
-rw-r--r--drivers/mtd/ubi/vmt.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index b79e0dea3632..366eb70219a6 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -790,11 +790,6 @@ static int paranoid_check_volume(struct ubi_device *ubi, int vol_id)
goto fail;
}
- if (!vol->name) {
- ubi_err("NULL volume name");
- goto fail;
- }
-
n = strnlen(vol->name, vol->name_len + 1);
if (n != vol->name_len) {
ubi_err("bad name_len %lld", n);