Merge 3.10-rc3 into usb-next

We want these fixes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index c76d16c972cc..f53b992f060a 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1208,11 +1208,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;
                 }