diff mbox series

[1/2] rtc: omap: check for clk_prepare_enable() error

Message ID 20171206194238.12824-2-andreas.platschek@opentech.at
State Changes Requested
Headers show
Series rtc: omap: clk_prepare_enable error handling | expand

Commit Message

Andreas Platschek Dec. 6, 2017, 7:42 p.m. UTC
clk_prepare_enable() returns an error -> check it.

Signed-off-by: Andreas Platschek <andreas.platschek@opentech.at>
---
 drivers/rtc/rtc-omap.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Alexandre Belloni Dec. 18, 2017, 9:42 p.m. UTC | #1
On 06/12/2017 at 20:42:37 +0100, Andreas Platschek wrote:
> clk_prepare_enable() returns an error -> check it.
> 
> Signed-off-by: Andreas Platschek <andreas.platschek@opentech.at>
> ---
>  drivers/rtc/rtc-omap.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
> index 1d666ac9ef70..ad309feb7d11 100644
> --- a/drivers/rtc/rtc-omap.c
> +++ b/drivers/rtc/rtc-omap.c
> @@ -748,8 +748,15 @@ static int omap_rtc_probe(struct platform_device *pdev)
>  	else
>  		rtc->clk = devm_clk_get(&pdev->dev, "int-clk");
>  
> -	if (!IS_ERR(rtc->clk))
> -		clk_prepare_enable(rtc->clk);
> +	if (!IS_ERR(rtc->clk)) {
> +		ret = clk_prepare_enable(rtc->clk);
> +		if (ret) {
> +			dev_err(&pdev->dev,
> +				"Failed to enable rtc clk (%u)\n", ret);

As this will never fail, can we avoid having a useless string?
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 1d666ac9ef70..ad309feb7d11 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -748,8 +748,15 @@  static int omap_rtc_probe(struct platform_device *pdev)
 	else
 		rtc->clk = devm_clk_get(&pdev->dev, "int-clk");
 
-	if (!IS_ERR(rtc->clk))
-		clk_prepare_enable(rtc->clk);
+	if (!IS_ERR(rtc->clk)) {
+		ret = clk_prepare_enable(rtc->clk);
+		if (ret) {
+			dev_err(&pdev->dev,
+				"Failed to enable rtc clk (%u)\n", ret);
+			return ret;
+		}
+	}
+
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	rtc->base = devm_ioremap_resource(&pdev->dev, res);