diff --git a/[refs] b/[refs]
index 158810d766af..bf8cbc284564 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc86cf7af2ebda88056538e8edff852ee627f76a
+refs/heads/master: 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc
diff --git a/trunk/drivers/mtd/ofpart.c b/trunk/drivers/mtd/ofpart.c
index 64be8f0848b0..d9127e2ed808 100644
--- a/trunk/drivers/mtd/ofpart.c
+++ b/trunk/drivers/mtd/ofpart.c
@@ -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);