diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2014-11-25 11:34:21 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-01 02:49:33 +0100 |
| commit | 2f0f609f2e3b874e8acf895459939903e6574d9c (patch) | |
| tree | aa54f3a7cda471bd6cf17cd887d4342587dcdf87 /drivers/cpufreq/cpufreq-dt.c | |
| parent | Merge branch 'pm-opp' into pm-cpufreq (diff) | |
| download | linux-2f0f609f2e3b874e8acf895459939903e6574d9c.tar.xz linux-2f0f609f2e3b874e8acf895459939903e6574d9c.zip | |
cpufreq-dt: free OPP table created during ->init()
OPP layer now supports freeing of OPPs and we should free them once they aren't
useful anymore.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/cpufreq-dt.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq-dt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index e720954244b1..9bc2720628a4 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -214,7 +214,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) { ret = -ENOMEM; - goto out_put_node; + goto out_free_opp; } of_property_read_u32(np, "voltage-tolerance", &priv->voltage_tolerance); @@ -294,7 +294,8 @@ out_free_cpufreq_table: dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); out_free_priv: kfree(priv); -out_put_node: +out_free_opp: + of_free_opp_table(cpu_dev); of_node_put(np); out_put_reg_clk: clk_put(cpu_clk); @@ -311,6 +312,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy) if (priv->cdev) cpufreq_cooling_unregister(priv->cdev); dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table); + of_free_opp_table(priv->cpu_dev); clk_put(policy->clk); if (!IS_ERR(priv->cpu_reg)) regulator_put(priv->cpu_reg); |