Commit e0c223ec authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Santosh Shilimkar

clk: keystone: gate: fix error handling on init

This patch fixes Keystone gate control clock driver initialization path:
1) clk_register_psc() returns error code and not a pure pointer, hence
its return value need to be checked using IS_ERR(clk) macro.

2) Mapped IO memory isn't unmapped in case of errors, hence fix it.

Cc: Mike Turquette <mturquette@linaro.org
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent dbb4e67f
...@@ -223,8 +223,7 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock) ...@@ -223,8 +223,7 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
data->domain_base = of_iomap(node, i); data->domain_base = of_iomap(node, i);
if (!data->domain_base) { if (!data->domain_base) {
pr_err("%s: domain ioremap failed\n", __func__); pr_err("%s: domain ioremap failed\n", __func__);
iounmap(data->control_base); goto unmap_ctrl;
goto out;
} }
of_property_read_u32(node, "domain-id", &data->domain_id); of_property_read_u32(node, "domain-id", &data->domain_id);
...@@ -237,16 +236,21 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock) ...@@ -237,16 +236,21 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
parent_name = of_clk_get_parent_name(node, 0); parent_name = of_clk_get_parent_name(node, 0);
if (!parent_name) { if (!parent_name) {
pr_err("%s: Parent clock not found\n", __func__); pr_err("%s: Parent clock not found\n", __func__);
goto out; goto unmap_domain;
} }
clk = clk_register_psc(NULL, clk_name, parent_name, data, lock); clk = clk_register_psc(NULL, clk_name, parent_name, data, lock);
if (clk) { if (!IS_ERR(clk)) {
of_clk_add_provider(node, of_clk_src_simple_get, clk); of_clk_add_provider(node, of_clk_src_simple_get, clk);
return; return;
} }
pr_err("%s: error registering clk %s\n", __func__, node->name); pr_err("%s: error registering clk %s\n", __func__, node->name);
unmap_domain:
iounmap(data->domain_base);
unmap_ctrl:
iounmap(data->control_base);
out: out:
kfree(data); kfree(data);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment