---

yaml --- r: 207743 b: refs/heads/master c: 00b275d h: refs/heads/master i: 207741: c8bd412 207739: eecff14 207735: 9d17a0e 207727: c1ffc8b 207711: 6a13f05 207679: 652f8c2 207615: 2cf5886 v: v3
git-mirror · Jun 3, 2010 · 2d510f4 · 2d510f4
1 parent 8a26bc3
commit 2d510f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b51adeae29d1ca07090d4f9c9c886499351e0129
+refs/heads/master: 00b275dbfc2ae3e3312a910736dd9a6bd5110c2b
diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c
@@ -353,22 +353,22 @@ static int __devinit of_flash_probe(struct of_device *dev,
 				   &info->parts, 0);
 	if (err < 0) {
 		of_free_probes(part_probe_types);
-		return err;
+		goto err_out;
 	}
 	of_free_probes(part_probe_types);
 
 #ifdef CONFIG_MTD_OF_PARTS
 	if (err == 0) {
 		err = of_mtd_parse_partitions(&dev->dev, dp, &info->parts);
 		if (err < 0)
-			return err;
+			goto err_out;
 	}
 #endif
 
 	if (err == 0) {
 		err = parse_obsolete_partitions(dev, info, dp);
 		if (err < 0)
-			return err;
+			goto err_out;
 	}
 
 	if (err > 0)