---

yaml --- r: 355439 b: refs/heads/master c: a167237 h: refs/heads/master i: 355437: b8b98f7 355435: 67ed933 355431: 291f0cd 355423: fd32c67 v: v3
git-mirror · Feb 1, 2013 · 17f02d2 · 17f02d2
1 parent f08385c
commit 17f02d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc6b1e7b86f5d8e4a6fc1c0189e64bba4077efe0
+refs/heads/master: a16723709cff6d69567024c28d32d1344f08cecf
diff --git a/trunk/arch/arm/mach-omap2/gpmc.c b/trunk/arch/arm/mach-omap2/gpmc.c
@@ -1271,9 +1271,10 @@ static int gpmc_probe_dt(struct platform_device *pdev)
 
 	for_each_node_by_name(child, "nand") {
 		ret = gpmc_probe_nand_child(pdev, child);
-		of_node_put(child);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(child);
 			return ret;
+		}
 	}
 
 	return 0;