[PATCH] of: base.c: Use correct device-tree in of_add_initrd()

[PATCH] of: base.c: Use correct device-tree in of_add_initrd()

[David Jander]

Otherwise only the internal DT is modified, not necessarily the one passed
to the kernel.

Signed-off-by: David Jander <david@protonic.nl>
---
 drivers/of/base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 34a06c2..ce474be 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1732,7 +1732,7 @@ int of_add_initrd(struct device_node *root, resource_size_t start,
 	struct device_node *chosen;
 	__be32 buf[2];
 
-	chosen = of_find_node_by_path("/chosen");
+	chosen = of_find_node_by_path_from(root, "/chosen");
 	if (!chosen)
 		return -EINVAL;
 
-- 
1.8.1.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] of: base.c: Use correct device-tree in of_add_initrd()

[Sascha Hauer]

Hi David,

On Wed, Aug 14, 2013 at 12:38:56PM +0200, David Jander wrote:
> Otherwise only the internal DT is modified, not necessarily the one passed
> to the kernel.
> 
> Signed-off-by: David Jander <david@protonic.nl>

Thanks. Applied to master and stable/v2013.08

Sascha

> ---
>  drivers/of/base.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 34a06c2..ce474be 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1732,7 +1732,7 @@ int of_add_initrd(struct device_node *root, resource_size_t start,
>  	struct device_node *chosen;
>  	__be32 buf[2];
>  
> -	chosen = of_find_node_by_path("/chosen");
> +	chosen = of_find_node_by_path_from(root, "/chosen");
>  	if (!chosen)
>  		return -EINVAL;
>  
> -- 
> 1.8.1.2
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox