2020-11-03 07:45:42

by Qinglang Miao

Subject: [PATCH v2] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume

Fix the missing clk_disable_unprepare() of info->pclk
before return from rockchip_saradc_resume in the error
handling case when fails to prepare and enable info->clk.

Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
Signed-off-by: Qinglang Miao <[email protected]>
---
drivers/iio/adc/rockchip_saradc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index 1f3d7d639..5eb566274 100644
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -461,9 +461,10 @@ static int rockchip_saradc_resume(struct device *dev)
return ret;

ret = clk_prepare_enable(info->clk);
- if (ret)
+ if (ret) {
+ clk_disable_unprepare(info->pclk);
return ret;
-
+ }
return ret;
}
#endif
--
2.23.0

2020-11-03 08:22:01

by Qinglang Miao

Subject: Re: [PATCH v2] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume

?? 2020/11/3 15:49, Qinglang Miao д??:
> Fix the missing clk_disable_unprepare() of info->pclk
> before return from rockchip_saradc_resume in the error
> handling case when fails to prepare and enable info->clk.
>
> Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> drivers/iio/adc/rockchip_saradc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
> index 1f3d7d639..5eb566274 100644
> --- a/drivers/iio/adc/rockchip_saradc.c
> +++ b/drivers/iio/adc/rockchip_saradc.c
> @@ -461,9 +461,10 @@ static int rockchip_saradc_resume(struct device *dev)
> return ret;
>
> ret = clk_prepare_enable(info->clk);
> - if (ret)
> + if (ret) {
> + clk_disable_unprepare(info->pclk);
> return ret;
> -
> + }
> return ret;
> }
> #endif
>
Hi everyone,

I made a careless mistake for adding v2 as subject-prefix, this patch is
the base version actually.

Sorry about that.

Thanks.

2020-11-03 11:15:38

by Robin Murphy

Subject: Re: [PATCH v2] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume

On 2020-11-03 07:49, Qinglang Miao wrote:
> Fix the missing clk_disable_unprepare() of info->pclk
> before return from rockchip_saradc_resume in the error
> handling case when fails to prepare and enable info->clk.
>
> Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> drivers/iio/adc/rockchip_saradc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
> index 1f3d7d639..5eb566274 100644
> --- a/drivers/iio/adc/rockchip_saradc.c
> +++ b/drivers/iio/adc/rockchip_saradc.c
> @@ -461,9 +461,10 @@ static int rockchip_saradc_resume(struct device *dev)
> return ret;
>
> ret = clk_prepare_enable(info->clk);
> - if (ret)
> + if (ret) {
> + clk_disable_unprepare(info->pclk);
> return ret;

No need to add braces, just replace this utterly pointless "early" return ;)

Robin.

> -
> + }
> return ret;
> }
> #endif
>

2020-11-03 12:07:03

by Qinglang Miao

Subject: Re: [PATCH v2] iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume

在 2020/11/3 19:11, Robin Murphy 写道:
> On 2020-11-03 07:49, Qinglang Miao wrote:
>> Fix the missing clk_disable_unprepare() of info->pclk
>> before return from rockchip_saradc_resume in the error
>> handling case when fails to prepare and enable info->clk.
>>
>> Fixes: 44d6f2ef94f9 ("iio: adc: add driver for Rockchip saradc")
>> Signed-off-by: Qinglang Miao <[email protected]>
>> ---
>>   drivers/iio/adc/rockchip_saradc.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/iio/adc/rockchip_saradc.c
>> b/drivers/iio/adc/rockchip_saradc.c
>> index 1f3d7d639..5eb566274 100644
>> --- a/drivers/iio/adc/rockchip_saradc.c
>> +++ b/drivers/iio/adc/rockchip_saradc.c
>> @@ -461,9 +461,10 @@ static int rockchip_saradc_resume(struct device
>> *dev)
>>           return ret;
>>       ret = clk_prepare_enable(info->clk);
>> -    if (ret)
>> +    if (ret) {
>> +        clk_disable_unprepare(info->pclk);
>>           return ret;
>
> No need to add braces, just replace this utterly pointless "early"
> return ;)
>
> Robin.
You are right Robin, thanks a lot! :D

I've sent a 'real' v2 patch based on your advice.
>
>> -
>> +    }
>>       return ret;
>>   }
>>   #endif
>>
> .