summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-01-07 11:57:51 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-01-07 11:57:51 +0100
commit32f9b1079a6ee088fce727b6827b6f1693ca8c0c (patch)
treed3fa3a705d06be11bea601891ea3a60bbeb22591 /commands
parentc56fdbbc37cf676b42bbbf8d0efd0b78df4aed22 (diff)
parente4e1fd5f36b3c8170f3a9ac75e433ddff3d5e447 (diff)
downloadbarebox-32f9b1079a6ee088fce727b6827b6f1693ca8c0c.tar.gz
barebox-32f9b1079a6ee088fce727b6827b6f1693ca8c0c.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/oftree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/commands/oftree.c b/commands/oftree.c
index 475f0199ba..3fa516c2b0 100644
--- a/commands/oftree.c
+++ b/commands/oftree.c
@@ -88,7 +88,8 @@ static int do_oftree(int argc, char *argv[])
if (root)
of_delete_node(root);
- return 0;
+ if (!load)
+ return 0;
}
if (optind < argc)