Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1643011 > unrolled thread

[PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable

Back to article view | Back to linux.kernel

Contents

  [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-05-17 09:00 +0200
    Re: [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of  clk_prepare_enable Viresh Kumar <viresh.kumar@linaro.org> - 2017-05-17 09:20 +0200

#1643011 — [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/cpufreq/kirkwood-cpufreq.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 1b9bcd7..c2dd43f 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -127,7 +127,12 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
 		return PTR_ERR(priv.cpu_clk);
 	}
 
-	clk_prepare_enable(priv.cpu_clk);
+	err = clk_prepare_enable(priv.cpu_clk);
+	if (err) {
+		dev_err(priv.dev, "Unable to prepare cpuclk\n");
+		return err;
+	}
+
 	kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
 
 	priv.ddr_clk = of_clk_get_by_name(np, "ddrclk");
@@ -137,7 +142,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
 		goto out_cpu;
 	}
 
-	clk_prepare_enable(priv.ddr_clk);
+	err = clk_prepare_enable(priv.ddr_clk);
+	if (err) {
+		dev_err(priv.dev, "Unable to prepare ddrclk\n");
+		goto out_cpu;
+	}
 	kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;
 
 	priv.powersave_clk = of_clk_get_by_name(np, "powersave");
@@ -146,7 +155,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
 		err = PTR_ERR(priv.powersave_clk);
 		goto out_ddr;
 	}
-	clk_prepare_enable(priv.powersave_clk);
+	err = clk_prepare_enable(priv.powersave_clk);
+	if (err) {
+		dev_err(priv.dev, "Unable to prepare powersave clk\n");
+		goto out_ddr;
+	}
 
 	of_node_put(np);
 	np = NULL;
-- 
1.9.1

[toc] | [next] | [standalone]

#1643033 — Re: [PATCH v3] cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable

On 17-05-17, 12:20, Arvind Yadav wrote:
> clk_prepare_enable() can fail here and we must check its return value.
> 
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
> ---
>  drivers/cpufreq/kirkwood-cpufreq.c | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
> index 1b9bcd7..c2dd43f 100644
> --- a/drivers/cpufreq/kirkwood-cpufreq.c
> +++ b/drivers/cpufreq/kirkwood-cpufreq.c
> @@ -127,7 +127,12 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
>  		return PTR_ERR(priv.cpu_clk);
>  	}
>  
> -	clk_prepare_enable(priv.cpu_clk);
> +	err = clk_prepare_enable(priv.cpu_clk);
> +	if (err) {
> +		dev_err(priv.dev, "Unable to prepare cpuclk\n");
> +		return err;
> +	}
> +
>  	kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
>  
>  	priv.ddr_clk = of_clk_get_by_name(np, "ddrclk");
> @@ -137,7 +142,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
>  		goto out_cpu;
>  	}
>  
> -	clk_prepare_enable(priv.ddr_clk);
> +	err = clk_prepare_enable(priv.ddr_clk);
> +	if (err) {
> +		dev_err(priv.dev, "Unable to prepare ddrclk\n");
> +		goto out_cpu;
> +	}
>  	kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;
>  
>  	priv.powersave_clk = of_clk_get_by_name(np, "powersave");
> @@ -146,7 +155,11 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
>  		err = PTR_ERR(priv.powersave_clk);
>  		goto out_ddr;
>  	}
> -	clk_prepare_enable(priv.powersave_clk);
> +	err = clk_prepare_enable(priv.powersave_clk);
> +	if (err) {
> +		dev_err(priv.dev, "Unable to prepare powersave clk\n");
> +		goto out_ddr;
> +	}
>  
>  	of_node_put(np);
>  	np = NULL;

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web