1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index b44292abd9f7..e472a0e9de9d 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -119,7 +119,8 @@ static struct mtd_partition * newpart(char *s,
                 char *p;
 
                 name = ++s;
-                if ((p = strchr(name, delim)) == 0)
+                p = strchr(name, delim);
+                if (!p)
                 {
                         printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
                         return NULL;
@@ -159,9 +160,10 @@ static struct mtd_partition * newpart(char *s,
                         return NULL;
                 }
                 /* more partitions follow, parse them */
-                if ((parts = newpart(s + 1, &s, num_parts,
-                                     this_part + 1, &extra_mem, extra_mem_size)) == 0)
-                  return NULL;
+                parts = newpart(s + 1, &s, num_parts, this_part + 1,
+                                &extra_mem, extra_mem_size);
+                if (!parts)
+                        return NULL;
         }
         else
         {       /* this is the last partition: allocate space for all */
@@ -308,9 +310,6 @@ static int parse_cmdline_partitions(struct mtd_info *master,
         struct cmdline_mtd_partition *part;
         char *mtd_id = master->name;
 
-        if(!cmdline)
-                return -EINVAL;
-
         /* parse command line */
         if (!cmdline_parsed)
                 mtdpart_setup_real(cmdline);
@@ -341,7 +340,7 @@ static int parse_cmdline_partitions(struct mtd_info *master,
                         return part->num_parts;
                 }
         }
-        return -EINVAL;
+        return 0;
 }