summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-07-14 19:45:19 (GMT)
committerStephen Boyd <sboyd@codeaurora.org>2015-07-28 18:51:39 (GMT)
commitc5e857a46af24a772f445edcc01a861ee2d6a713 (patch)
tree1d4e9864101a7c05d01a5b05f46c19567d833838
parent006cb8b66e18ce7aff934883f6c50e3b85052681 (diff)
downloadlinux-c5e857a46af24a772f445edcc01a861ee2d6a713.tar.xz
clk: gpio: Unlock mutex on error path
We don't unlock the mutex if we fail to allocate the parent names array. Unlock it and return an error in this case as well. Reported-by: kbuild test robot <fengguang.wu@intel.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Cc: Sergej Sawazki <ce3a@gmx.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/clk-gpio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c
index c0d202c..41277a1 100644
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
@@ -251,8 +251,10 @@ static struct clk *of_clk_gpio_delayed_register_get(
num_parents = of_clk_get_parent_count(data->node);
parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL);
- if (!parent_names)
- return ERR_PTR(-ENOMEM);
+ if (!parent_names) {
+ clk = ERR_PTR(-ENOMEM);
+ goto out;
+ }
for (i = 0; i < num_parents; i++)
parent_names[i] = of_clk_get_parent_name(data->node, i);