rtc: rv3032: fix error handling in rv3032_clkout_set_rate()

PATCH Superseded Dan Carpenter 1 participant 2 messages Oct 12, 2021

Subsystems (2)

Kernel janitors Real time clock (RTC)

lore

Share & tools

lore

Dan Carpenter

author

2021-10-12 08:26 UTC #0 lore raw

PATCH 1/1 rtc: rv3032: fix error handling in rv3032_clkout_set_rate()

Do not call rv3032_exit_eerd() if the enter function fails but don't forget to call the exit on if the enter succeeds.

Fixes 2eeaa532acca ("rtc: rv3032: Add a driver for Microcrystal RV-3032")

Signed-off-by Dan Carpenter <[email protected]>

---
 drivers/rtc/rtc-rv3032.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/rtc/rtc-rv3032.c +2 -2

index d63102d5cb1e..1b62ed2f1459 100644
@@ -617,11 +617,11 @@ static int rv3032_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
 
 	ret = rv3032_enter_eerd(rv3032, &eerd);
 	if (ret)
-		goto exit_eerd;
+		return ret;
 
 	ret = regmap_write(rv3032->regmap, RV3032_CLKOUT1, hfd & 0xff);
 	if (ret)
-		return ret;
+		goto exit_eerd;
 
 	ret = regmap_write(rv3032->regmap, RV3032_CLKOUT2, RV3032_CLKOUT2_OS |
 			    FIELD_PREP(RV3032_CLKOUT2_HFD_MSK, hfd >> 8));

Signature · 1 line

2.20.1

Dan Carpenter

author

2021-10-12 10:08 UTC #1 lore raw

Quoted 2 lines · Dan Carpenter

Do not call rv3032_exit_eerd() if the enter function fails but don't forget to call the exit on if the enter succeeds.

                          ^^^^^

Let me resend... :/

regards,
dan carpenter