diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:55 +0200 |
| commit | 07afe7d0e00a9e14c5918a887161e6ccce542165 (patch) | |
| tree | d1327c21b23f30d9e4fbb90f01e472e05e8a0f5f /commands | |
| parent | b1aae799f93634bc724c49268972457e0361a633 (diff) | |
| parent | 6f6e1377e4b1c71fa4a7a7290dcc79a7301cc4f9 (diff) | |
| download | barebox-07afe7d0e00a9e14c5918a887161e6ccce542165.tar.gz barebox-07afe7d0e00a9e14c5918a887161e6ccce542165.tar.xz | |
Merge branch 'for-next/marvell'
Conflicts:
arch/arm/boards/Makefile
arch/arm/dts/Makefile
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/of_node.c | 2 | ||||
| -rw-r--r-- | commands/oftree.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/commands/of_node.c b/commands/of_node.c index e60ef66d38..b1894b184d 100644 --- a/commands/of_node.c +++ b/commands/of_node.c @@ -87,7 +87,7 @@ static int do_of_node(int argc, char *argv[]) return -ENOENT; } - of_free(node); + of_delete_node(node); } return 0; diff --git a/commands/oftree.c b/commands/oftree.c index 914951735b..00e54dcd7e 100644 --- a/commands/oftree.c +++ b/commands/oftree.c @@ -86,7 +86,7 @@ static int do_oftree(int argc, char *argv[]) struct device_node *root = of_get_root_node(); if (root) - of_free(root); + of_delete_node(root); return 0; } @@ -162,7 +162,7 @@ static int do_oftree(int argc, char *argv[]) goto out; } of_print_nodes(root, 0); - of_free(root); + of_delete_node(root); } else { struct device_node *n = of_find_node_by_path(node); if (!n) { |