2017-08-08 09:55:23

by Arvind Yadav

Subject: [PATCH] mfd: t7l66xb: Handle return value of clk_prepare_enable

clk_prepare_enable() can fail here and we must check its return value.
we must disable clock, if t7l66xb_probe is not successful.

Signed-off-by: Arvind Yadav <[email protected]>
---
drivers/mfd/t7l66xb.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 22c8113..43d8683 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -86,8 +86,11 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc)
struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
unsigned long flags;
u8 dev_ctl;
+ int ret;

- clk_prepare_enable(t7l66xb->clk32k);
+ ret = clk_prepare_enable(t7l66xb->clk32k);
+ if (ret)
+ return ret;

raw_spin_lock_irqsave(&t7l66xb->lock, flags);

@@ -286,8 +289,12 @@ static int t7l66xb_resume(struct platform_device *dev)
{
struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
+ int ret;
+
+ ret = clk_prepare_enable(t7l66xb->clk48m);
+ if (ret)
+ return ret;

- clk_prepare_enable(t7l66xb->clk48m);
if (pdata && pdata->resume)
pdata->resume(dev);

@@ -361,7 +368,9 @@ static int t7l66xb_probe(struct platform_device *dev)
goto err_ioremap;
}

- clk_prepare_enable(t7l66xb->clk48m);
+ ret = clk_prepare_enable(t7l66xb->clk48m);
+ if (ret)
+ goto err_clk_enable;

if (pdata->enable)
pdata->enable(dev);
@@ -386,6 +395,8 @@ static int t7l66xb_probe(struct platform_device *dev)
return 0;

t7l66xb_detach_irq(dev);
+ clk_disable_unprepare(t7l66xb->clk48m);
+err_clk_enable:
iounmap(t7l66xb->scr);
err_ioremap:
release_resource(&t7l66xb->rscr);
--
1.9.1

2017-08-21 07:45:17

by Lee Jones

Subject: Re: [PATCH] mfd: t7l66xb: Handle return value of clk_prepare_enable

On Tue, 08 Aug 2017, Arvind Yadav wrote:

> clk_prepare_enable() can fail here and we must check its return value.
> we must disable clock, if t7l66xb_probe is not successful.
>
> Signed-off-by: Arvind Yadav <[email protected]>
> ---
> drivers/mfd/t7l66xb.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)

Applied, thanks.

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog