2014-06-17 14:30:47

by Jeff Liu

Subject: [PATCH 15/24] drivers/of: return actual error on of_init

From: Jie Liu <[email protected]>

Return the actual error code if call kset_create_and_add() failed

Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Jie Liu <[email protected]>
---
drivers/of/base.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 8368d96..8f8efa1 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -290,9 +290,9 @@ static int __init of_init(void)
/* Create the kset, and register existing nodes */
mutex_lock(&of_aliases_mutex);
of_kset = kset_create_and_add("devicetree", NULL, firmware_kobj);
- if (!of_kset) {
+ if (IS_ERR(of_kset)) {
mutex_unlock(&of_aliases_mutex);
- return -ENOMEM;
+ return PTR_ERR(of_kset);
}
for_each_of_allnodes(np)
__of_node_add(np);
--
1.8.3.2

2014-06-17 19:18:13

by Greg Kroah-Hartman

Subject: Re: [PATCH 15/24] drivers/of: return actual error on of_init

On Tue, Jun 17, 2014 at 10:30:38PM +0800, Jeff Liu wrote:
> From: Jie Liu <[email protected]>
>
> Return the actual error code if call kset_create_and_add() failed
>
> Cc: Greg Kroah-Hartman <[email protected]>
> Signed-off-by: Jie Liu <[email protected]>
> ---
> drivers/of/base.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Nope, not taking this, sorry.