diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-18 13:46:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-18 13:46:50 -0400 |
commit | ff9129b06cfb05cb5920f1151c75506afe1586fe (patch) | |
tree | bf527a9d8db078b37da863e5959cfb100622aadb /drivers | |
parent | 3c6a279ffccd0c414ecd1d5eb4670ed70072c526 (diff) | |
parent | 3132f623386e9ac87077bd839e726f7b940fbc94 (diff) |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree fixes from Grant Likely:
"Device tree bug fixes and documentation updates for v3.10
Nothing earth shattering here. A build failure fix, and fix for
releasing nodes and some documenation updates."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
Documentation/devicetree: make semantic of initrd-end more explicit
of/base: release the node correctly in of_parse_phandle_with_args()
of/documentation: move video device bindings to a common place
<linux/of_platform.h>: fix compilation warnings with DT disabled
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/of/base.c | 4 |
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, | |||
1208 | out_args->args_count = count; | 1208 | out_args->args_count = count; |
1209 | for (i = 0; i < count; i++) | 1209 | for (i = 0; i < count; i++) |
1210 | out_args->args[i] = be32_to_cpup(list++); | 1210 | out_args->args[i] = be32_to_cpup(list++); |
1211 | } else { | ||
1212 | of_node_put(node); | ||
1211 | } | 1213 | } |
1212 | 1214 | ||
1213 | /* Found it! return success */ | 1215 | /* Found it! return success */ |
1214 | if (node) | ||
1215 | of_node_put(node); | ||
1216 | return 0; | 1216 | return 0; |
1217 | } | 1217 | } |
1218 | 1218 | ||