2 files changed, 2 insertions, 13 deletions

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 336482a55f84..1cb22bfae750 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -685,13 +685,6 @@ static int __init ubi_init(void)
                 struct mtd_dev_param *p = &mtd_dev_param[i];
 
                 cond_resched();
-
-                if (!p->name) {
-                        dbg_err("empty name");
-                        err = -EINVAL;
-                        goto out_detach;
-                }
-
                 err = attach_mtd_dev(p->name, p->vid_hdr_offs, p->data_offs);
                 if (err)
                         goto out_detach;
@@ -798,7 +791,7 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
 
         /* Get rid of the final newline */
         if (buf[len - 1] == '\n')
-                buf[len - 1] = 0;
+                buf[len - 1] = '\0';
 
         for (i = 0; i < 3; i++)
                 tokens[i] = strsep(&pbuf, ",");
@@ -808,9 +801,6 @@ static int __init ubi_mtd_param_parse(const char *val, struct kernel_param *kp)
                 return -EINVAL;
         }
 
-        if (tokens[0] == '\0')
-                return -EINVAL;
-
         p = &mtd_dev_param[mtd_devs];
         strcpy(&p->name[0], tokens[0]);
 
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 78cae4940875..4a458e83e4e9 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -38,9 +38,8 @@ int ubi_get_device_info(int ubi_num, struct ubi_device_info *di)
         const struct ubi_device *ubi;
 
         if (ubi_num < 0 || ubi_num >= UBI_MAX_DEVICES ||
-            !ubi_devices[ubi_num]) {
+            !ubi_devices[ubi_num])
                 return -ENODEV;
-        }
 
         ubi = ubi_devices[ubi_num];
         di->ubi_num = ubi->ubi_num;