diff options
author | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 (patch) | |
tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 /drivers/video | |
parent | 37791b6fbe7ab772020e714d34515f144fa981a0 (diff) | |
parent | 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66 (diff) |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts:
drivers/of/unittest.c
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c index 42b87f95267c..8b6f6d5fdd68 100644 --- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c +++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c @@ -164,20 +164,15 @@ static void __init omapdss_walk_device(struct device_node *node, bool root) pn = of_graph_get_remote_port_parent(n); - if (!pn) { - of_node_put(n); + if (!pn) continue; - } if (!of_device_is_available(pn) || omapdss_list_contains(pn)) { of_node_put(pn); - of_node_put(n); continue; } omapdss_walk_device(pn, false); - - of_node_put(n); } } |