diff --git a/[refs] b/[refs]
index 1afa0bfb76dc..cd1f85b6735c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 658e81701970a82d33f46241f20be416ebd5e930
+refs/heads/master: 8d9ae994d8fce807fc90fb8e3b6ac8df1cc7dce6
diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c
index 3df001bfee36..096dd47b5d5d 100644
--- a/trunk/drivers/mtd/maps/physmap_of.c
+++ b/trunk/drivers/mtd/maps/physmap_of.c
@@ -142,6 +142,8 @@ static int __devinit process_partitions(struct physmap_flash_info *info,
 		}
 	} else {
 		nr_parts = parse_obsolete_partitions(dev, info, dp);
+		if (nr_parts == -ENOENT)
+			nr_parts = 0;
 	}
 
 	if (nr_parts < 0)