diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-18 10:46:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-18 10:46:50 -0700 |
| commit | ff9129b06cfb05cb5920f1151c75506afe1586fe (patch) | |
| tree | bf527a9d8db078b37da863e5959cfb100622aadb /drivers/of | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD (diff) | |
| download | linux-dev-ff9129b06cfb05cb5920f1151c75506afe1586fe.tar.xz linux-dev-ff9129b06cfb05cb5920f1151c75506afe1586fe.zip | |
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/of')
| -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, 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; } |