diff options
author | Leonard Crestez <leonard.crestez@nxp.com> | 2017-02-20 08:20:56 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-03-07 08:19:20 -0500 |
commit | 253160a8ad06bcc1c1db16a58b1f06d5128f6c5e (patch) | |
tree | e069d6c9cf9e16cd4ff831912764f8d08a0422d0 | |
parent | cda82ace3d4eff6a38f00a65db435fe35a3916f0 (diff) |
clk: core: Copy connection id
Some drivers use sprintf to build clk connection id names but the clk
core will save those strings and occasionally print them back. Duplicate
the con_id strings instead of fixing all the users.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/clk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 0fb39fe217d1..67201f67a14a 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c | |||
@@ -2502,7 +2502,7 @@ struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id, | |||
2502 | 2502 | ||
2503 | clk->core = hw->core; | 2503 | clk->core = hw->core; |
2504 | clk->dev_id = dev_id; | 2504 | clk->dev_id = dev_id; |
2505 | clk->con_id = con_id; | 2505 | clk->con_id = kstrdup_const(con_id, GFP_KERNEL); |
2506 | clk->max_rate = ULONG_MAX; | 2506 | clk->max_rate = ULONG_MAX; |
2507 | 2507 | ||
2508 | clk_prepare_lock(); | 2508 | clk_prepare_lock(); |
@@ -2518,6 +2518,7 @@ void __clk_free_clk(struct clk *clk) | |||
2518 | hlist_del(&clk->clks_node); | 2518 | hlist_del(&clk->clks_node); |
2519 | clk_prepare_unlock(); | 2519 | clk_prepare_unlock(); |
2520 | 2520 | ||
2521 | kfree_const(clk->con_id); | ||
2521 | kfree(clk); | 2522 | kfree(clk); |
2522 | } | 2523 | } |
2523 | 2524 | ||