diff --git a/[refs] b/[refs]
index 16983939fb6d..3d8bdf9fc233 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48d045dbe9c757681edfe8274211254c56d53a41
+refs/heads/master: b855f16b05a697ac1863adabe99bfba56e6d3199
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 321d3ef05006..e77e71989e81 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -1166,11 +1166,11 @@ static int __of_parse_phandle_with_args(const struct device_node *np,
 				out_args->args_count = count;
 				for (i = 0; i < count; i++)
 					out_args->args[i] = be32_to_cpup(list++);
+			} else {
+				of_node_put(node);
 			}
 
 			/* Found it! return success */
-			if (node)
-				of_node_put(node);
 			return 0;
 		}