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


Groups > linux.kernel > #1653113 > unrolled thread

[PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable

Started byArvind Yadav <arvind.yadav.cs@gmail.com>
First post2017-05-30 13:00 +0200
Last post2017-05-30 18:50 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-05-30 13:00 +0200
    Re: [PATCH] Input: s3c2410_ts - Handle return value of  clk_prepare_enable Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-05-30 18:50 +0200

#1653113 — [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable

FromArvind Yadav <arvind.yadav.cs@gmail.com>
Date2017-05-30 13:00 +0200
Subject[PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable
Message-ID<tMN2x-6he-11@gated-at.bofh.it>
clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/input/touchscreen/s3c2410_ts.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 41d58e8..3b3db8c 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -264,7 +264,11 @@ static int s3c2410ts_probe(struct platform_device *pdev)
 		return -ENOENT;
 	}
 
-	clk_prepare_enable(ts.clock);
+	ret = clk_prepare_enable(ts.clock);
+	if (ret) {
+		dev_err(dev, "Failed! to enabled clocks\n");
+		goto err_clk_get;
+	}
 	dev_dbg(dev, "got and enabled clocks\n");
 
 	ts.irq_tc = ret = platform_get_irq(pdev, 0);
@@ -353,7 +357,9 @@ static int s3c2410ts_probe(struct platform_device *pdev)
  err_iomap:
 	iounmap(ts.io);
  err_clk:
+	clk_disable_unprepare(ts.clock);
 	del_timer_sync(&touch_timer);
+ err_clk_get:
 	clk_put(ts.clock);
 	return ret;
 }
-- 
1.9.1

[toc] | [next] | [standalone]


#1653387 — Re: [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable

FromDmitry Torokhov <dmitry.torokhov@gmail.com>
Date2017-05-30 18:50 +0200
SubjectRe: [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable
Message-ID<tMSvg-1kx-17@gated-at.bofh.it>
In reply to#1653113
On Tue, May 30, 2017 at 04:22:57PM +0530, 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>

Applied, thank you.

> ---
>  drivers/input/touchscreen/s3c2410_ts.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
> index 41d58e8..3b3db8c 100644
> --- a/drivers/input/touchscreen/s3c2410_ts.c
> +++ b/drivers/input/touchscreen/s3c2410_ts.c
> @@ -264,7 +264,11 @@ static int s3c2410ts_probe(struct platform_device *pdev)
>  		return -ENOENT;
>  	}
>  
> -	clk_prepare_enable(ts.clock);
> +	ret = clk_prepare_enable(ts.clock);
> +	if (ret) {
> +		dev_err(dev, "Failed! to enabled clocks\n");
> +		goto err_clk_get;
> +	}
>  	dev_dbg(dev, "got and enabled clocks\n");
>  
>  	ts.irq_tc = ret = platform_get_irq(pdev, 0);
> @@ -353,7 +357,9 @@ static int s3c2410ts_probe(struct platform_device *pdev)
>   err_iomap:
>  	iounmap(ts.io);
>   err_clk:
> +	clk_disable_unprepare(ts.clock);
>  	del_timer_sync(&touch_timer);
> + err_clk_get:
>  	clk_put(ts.clock);
>  	return ret;
>  }
> -- 
> 1.9.1
> 

-- 
Dmitry

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web