Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / mtd / cmdlinepart.c

diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 99d4c40..a66e5a6 100644 (file)
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -94,7 +94,7 @@ static struct mtd_partition * newpart(char *s,
                if (size < PAGE_SIZE)
                {
                        printk(KERN_ERR ERRP "partition size too small (%lx)\n", size);
-                       return 0;
+                       return NULL;
                }
        }
 
@@ -121,7 +121,7 @@ static struct mtd_partition * newpart(char *s,
                if ((p = strchr(name, delim)) == 0)
                {
                        printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
-                       return 0;
+                       return NULL;
                }
                name_len = p - name;
                s = p + 1;
@@ -148,12 +148,12 @@ static struct mtd_partition * newpart(char *s,
                if (size == SIZE_REMAINING)
                {
                        printk(KERN_ERR ERRP "no partitions allowed after a fill-up partition\n");
-                       return 0;
+                       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 0;
+                 return NULL;
        }
        else
        {       /* this is the last partition: allocate space for all */
@@ -166,7 +166,7 @@ static struct mtd_partition * newpart(char *s,
                if (!parts)
                {
                        printk(KERN_ERR ERRP "out of memory\n");
-                       return 0;
+                       return NULL;
                }
                memset(parts, 0, alloc_size);
                extra_mem = (unsigned char *)(parts + *num_parts);