From acd24c3d52691cabc20e1aa0b6bc2ea54b16aa78 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 11 Jul 2007 16:03:29 +0300
Subject: [PATCH] --- yaml --- r: 61235 b: refs/heads/master c:
 503990ebb21e5aabe497a3eb1d39bef0bbc1be6f h: refs/heads/master i:   61233:
 2506af352e012c8df2f3e37cb6426113806fca28   61231:
 c757f2b7a3fe9dc5ade3b7c2cac4300cc714721f v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mtd/ubi/build.c | 12 +-----------
 trunk/drivers/mtd/ubi/kapi.c  |  3 +--
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index e8c50493f0d5..99b34a5c4ca3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2db61c95c03d08bb885c87a816540e75190c924a
+refs/heads/master: 503990ebb21e5aabe497a3eb1d39bef0bbc1be6f
diff --git a/trunk/drivers/mtd/ubi/build.c b/trunk/drivers/mtd/ubi/build.c
index 336482a55f84..1cb22bfae750 100644
--- a/trunk/drivers/mtd/ubi/build.c
+++ b/trunk/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/trunk/drivers/mtd/ubi/kapi.c b/trunk/drivers/mtd/ubi/kapi.c
index 78cae4940875..4a458e83e4e9 100644
--- a/trunk/drivers/mtd/ubi/kapi.c
+++ b/trunk/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;