summaryrefslogtreecommitdiffstats
path: root/drivers/bus/vexpress-config.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-29 09:42:07 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-29 09:42:07 +0100
commit6aa447bcbb444cd1b738613a20627f288d631665 (patch)
tree62030bb14be0006248181305ac1fe377a99e5b65 /drivers/bus/vexpress-config.c
parentabedf8e2419fb873d919dd74de2e84b510259339 (diff)
parent48be3a67da7413d62e5efbcf2c73a9dddf61fb96 (diff)
downloadtalos-obmc-linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.gz
talos-obmc-linux-6aa447bcbb444cd1b738613a20627f288d631665.zip
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/bus/vexpress-config.c')
-rw-r--r--drivers/bus/vexpress-config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c
index 6575c0fe6a4e..c3cb76b363c6 100644
--- a/drivers/bus/vexpress-config.c
+++ b/drivers/bus/vexpress-config.c
@@ -192,8 +192,10 @@ static int __init vexpress_config_init(void)
/* Need the config devices early, before the "normal" devices... */
for_each_compatible_node(node, NULL, "arm,vexpress,config-bus") {
err = vexpress_config_populate(node);
- if (err)
+ if (err) {
+ of_node_put(node);
break;
+ }
}
return err;
OpenPOWER on IntegriCloud