From 17f02d2beb606d032cb78c74151314bba0451129 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date: Fri, 25 Jan 2013 09:19:47 -0300
Subject: [PATCH] --- yaml --- r: 355439 b: refs/heads/master c:
 a16723709cff6d69567024c28d32d1344f08cecf h: refs/heads/master i:   355437:
 b8b98f70c88efe1682e7bbd45e5b295edf0a3d61   355435:
 67ed933553de1dcb711d201984ffb2640a1ad8ab   355431:
 291f0cd0c833c83cab127e5c649db6da0b9cb05f   355423:
 fd32c67e9e33600e860aeea5d667933d61972330 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-omap2/gpmc.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a227d73498a6..0a0a68c0de11 100644
--- 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
index 01ce462e265d..c6255f788ab2 100644
--- 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;