If add_preferred_console() returns error then we must free a
copy of `of_stdout_options' that we create right before the
console registration.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
---
drivers/of/base.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 260d33c0f26c..9fcf7011d206 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1779,10 +1779,17 @@ EXPORT_SYMBOL_GPL(of_alias_get_highest_id);
*/
bool of_console_check(struct device_node *dn, char *name, int index)
{
+ bool ret;
+ char *options;
+
if (!dn || dn != of_stdout || console_set_on_cmdline)
return false;
- return !add_preferred_console(name, index,
- kstrdup(of_stdout_options, GFP_KERNEL));
+
+ options = kstrdup(of_stdout_options, GFP_KERNEL);
+ ret = add_preferred_console(name, index, options);
+ if (ret)
+ kfree(options);
+ return !ret;
}
EXPORT_SYMBOL_GPL(of_console_check);
--
2.14.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
