diff options
author | Shailendra Verma <shailendra.capricorn@gmail.com> | 2015-08-04 03:45:16 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-14 05:33:47 -0400 |
commit | 62c3f2fddd438d6d8d0a3cbb195637b74c3654eb (patch) | |
tree | 6eaddd5ff1eb2b34664413d71b9e0e3b6b303084 | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) |
cpufreq: exynos: Fix for memory leak in case SoC name does not match
During probe free the memory allocated to "exynos_info" in case of
unknown SoC type.
Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
[k.kozlowski: Rebased the patch around if(of_machine_is_compatible)]
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/cpufreq/exynos-cpufreq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c index ae5b2bd3a978..fa3dd840a837 100644 --- a/drivers/cpufreq/exynos-cpufreq.c +++ b/drivers/cpufreq/exynos-cpufreq.c | |||
@@ -180,7 +180,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) | |||
180 | ret = exynos5250_cpufreq_init(exynos_info); | 180 | ret = exynos5250_cpufreq_init(exynos_info); |
181 | } else { | 181 | } else { |
182 | pr_err("%s: Unknown SoC type\n", __func__); | 182 | pr_err("%s: Unknown SoC type\n", __func__); |
183 | return -ENODEV; | 183 | ret = -ENODEV; |
184 | } | 184 | } |
185 | 185 | ||
186 | if (ret) | 186 | if (ret) |
@@ -188,12 +188,14 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) | |||
188 | 188 | ||
189 | if (exynos_info->set_freq == NULL) { | 189 | if (exynos_info->set_freq == NULL) { |
190 | dev_err(&pdev->dev, "No set_freq function (ERR)\n"); | 190 | dev_err(&pdev->dev, "No set_freq function (ERR)\n"); |
191 | ret = -EINVAL; | ||
191 | goto err_vdd_arm; | 192 | goto err_vdd_arm; |
192 | } | 193 | } |
193 | 194 | ||
194 | arm_regulator = regulator_get(NULL, "vdd_arm"); | 195 | arm_regulator = regulator_get(NULL, "vdd_arm"); |
195 | if (IS_ERR(arm_regulator)) { | 196 | if (IS_ERR(arm_regulator)) { |
196 | dev_err(&pdev->dev, "failed to get resource vdd_arm\n"); | 197 | dev_err(&pdev->dev, "failed to get resource vdd_arm\n"); |
198 | ret = -EINVAL; | ||
197 | goto err_vdd_arm; | 199 | goto err_vdd_arm; |
198 | } | 200 | } |
199 | 201 | ||
@@ -225,7 +227,7 @@ err_cpufreq_reg: | |||
225 | regulator_put(arm_regulator); | 227 | regulator_put(arm_regulator); |
226 | err_vdd_arm: | 228 | err_vdd_arm: |
227 | kfree(exynos_info); | 229 | kfree(exynos_info); |
228 | return -EINVAL; | 230 | return ret; |
229 | } | 231 | } |
230 | 232 | ||
231 | static struct platform_driver exynos_cpufreq_platdrv = { | 233 | static struct platform_driver exynos_cpufreq_platdrv = { |