From: viresh.kumar@linaro.org (Viresh Kumar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match.
Date: Sat, 23 May 2015 10:12:02 +0530 [thread overview]
Message-ID: <20150523044202.GA5751@linux> (raw)
In-Reply-To: <1432350171-2414-1-git-send-email-shailendra.capricorn@gmail.com>
On 23-05-15, 08:32, Shailendra Verma wrote:
> During probe free the memory allocated to "exynos_info" in case of
> unknown SOC type.
>
> Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
> ---
> drivers/cpufreq/exynos-cpufreq.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
> index 82d2fbb..5b57a0f 100644
> --- a/drivers/cpufreq/exynos-cpufreq.c
> +++ b/drivers/cpufreq/exynos-cpufreq.c
> @@ -182,20 +182,25 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
> ret = exynos5250_cpufreq_init(exynos_info);
> } else {
> pr_err("%s: Unknown SoC type\n", __func__);
> - return -ENODEV;
> + ret = -ENODEV;
> + goto err_vdd_arm;
Because we are going to check ret again, don't add the goto here. The
below code will take care of this.
> }
>
> - if (ret)
> + if (ret) {
> + ret = -EINVAL;
Why update ret here ?
> goto err_vdd_arm;
> + }
>
> if (exynos_info->set_freq == NULL) {
> dev_err(&pdev->dev, "No set_freq function (ERR)\n");
> + ret = -EINVAL;
> goto err_vdd_arm;
> }
>
> arm_regulator = regulator_get(NULL, "vdd_arm");
> if (IS_ERR(arm_regulator)) {
> dev_err(&pdev->dev, "failed to get resource vdd_arm\n");
> + ret = -EINVAL;
> goto err_vdd_arm;
> }
>
> @@ -203,8 +208,10 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
> locking_frequency = clk_get_rate(exynos_info->cpu_clk) / 1000;
>
> ret = cpufreq_register_driver(&exynos_driver);
> - if (ret)
> + if (ret) {
> + ret = -EINVAL;
Wrong again.
> goto err_cpufreq_reg;
> + }
>
> cpu0 = of_get_cpu_node(0, NULL);
> if (!cpu0) {
> @@ -227,7 +234,7 @@ err_cpufreq_reg:
> regulator_put(arm_regulator);
> err_vdd_arm:
> kfree(exynos_info);
> - return -EINVAL;
> + return ret;
> }
--
viresh
next prev parent reply other threads:[~2015-05-23 4:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-23 3:02 [PATCH] cpufreq:exynos-cpufreq - Fix for memory leak in case SOC name does not match Shailendra Verma
2015-05-23 4:42 ` Viresh Kumar [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-25 2:09 Shailendra Verma
2015-05-25 7:31 ` Viresh Kumar
2015-06-08 8:31 ` Lukasz Majewski
2015-06-08 23:30 ` Rafael J. Wysocki
2015-06-09 7:07 ` Lukasz Majewski
2015-06-09 7:23 ` Krzysztof Kozlowski
2015-05-21 18:29 Shailendra Verma
2015-05-22 2:17 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150523044202.GA5751@linux \
--to=viresh.kumar@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).