2019-12-05 16:17:07

by Chuhong Yuan

Subject: [PATCH] rtc: stm32: add missed clk_disable_unprepare in error path of resume

The resume() forgets to call clk_disable_unprepare() when failed.
Add the missed call to fix it.

Signed-off-by: Chuhong Yuan <[email protected]>
---
drivers/rtc/rtc-stm32.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-stm32.c b/drivers/rtc/rtc-stm32.c
index 781cabb2afca..d774aa18f57a 100644
--- a/drivers/rtc/rtc-stm32.c
+++ b/drivers/rtc/rtc-stm32.c
@@ -897,8 +897,11 @@ static int stm32_rtc_resume(struct device *dev)
}

ret = stm32_rtc_wait_sync(rtc);
- if (ret < 0)
+ if (ret < 0) {
+ if (rtc->data->has_pclk)
+ clk_disable_unprepare(rtc->pclk);
return ret;
+ }

if (device_may_wakeup(dev))
return disable_irq_wake(rtc->irq_alarm);
--
2.24.0

2019-12-06 08:20:45

by Amelie Delaunay

Subject: Re: [PATCH] rtc: stm32: add missed clk_disable_unprepare in error path of resume

On 12/5/19 5:06 PM, Chuhong Yuan wrote:
> The resume() forgets to call clk_disable_unprepare() when failed.
> Add the missed call to fix it.
>
> Signed-off-by: Chuhong Yuan <[email protected]>
> ---
> drivers/rtc/rtc-stm32.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/rtc/rtc-stm32.c b/drivers/rtc/rtc-stm32.c
> index 781cabb2afca..d774aa18f57a 100644
> --- a/drivers/rtc/rtc-stm32.c
> +++ b/drivers/rtc/rtc-stm32.c
> @@ -897,8 +897,11 @@ static int stm32_rtc_resume(struct device *dev)
> }
>
> ret = stm32_rtc_wait_sync(rtc);
> - if (ret < 0)
> + if (ret < 0) {
> + if (rtc->data->has_pclk)
> + clk_disable_unprepare(rtc->pclk);
> return ret;
> + }
>
> if (device_may_wakeup(dev))
> return disable_irq_wake(rtc->irq_alarm);
>

Reviewed-by: Amelie Delaunay <[email protected]>

2019-12-10 13:30:37

by Alexandre Belloni

Subject: Re: [PATCH] rtc: stm32: add missed clk_disable_unprepare in error path of resume

On 06/12/2019 00:06:55+0800, Chuhong Yuan wrote:
> The resume() forgets to call clk_disable_unprepare() when failed.
> Add the missed call to fix it.
>
> Signed-off-by: Chuhong Yuan <[email protected]>
> ---
> drivers/rtc/rtc-stm32.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
Applied, thanks.

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com