Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000 (10:38 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 21 Nov 2012 10:38:13 +0000 (10:38 +0000)
Conflicts:
drivers/mtd/nand/nand_base.c

drivers/mtd/ofpart.c

index 64be8f0848b075cdccb647309ff88d12b3fa547d..d9127e2ed808eab6ddfe5835c68cfa88ef490cf0 100644 (file)
@@ -121,7 +121,7 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
        nr_parts = plen / sizeof(part[0]);
 
        *pparts = kzalloc(nr_parts * sizeof(*(*pparts)), GFP_KERNEL);
-       if (!pparts)
+       if (!*pparts)
                return -ENOMEM;
 
        names = of_get_property(dp, "partition-names", &plen);