kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
@ 2021-10-12 10:10 Dan Carpenter
  2021-10-15 19:12 ` Alexandre Belloni
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-10-12 10:10 UTC (permalink / raw)
  To: Alessandro Zummo; +Cc: Alexandre Belloni, linux-rtc, kernel-janitors

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

Fixes: 2eeaa532acca ("rtc: rv3032: Add a driver for Microcrystal RV-3032")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: Fix a type in the commit message

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

diff --git a/drivers/rtc/rtc-rv3032.c b/drivers/rtc/rtc-rv3032.c
index d63102d5cb1e..1b62ed2f1459 100644
--- a/drivers/rtc/rtc-rv3032.c
+++ b/drivers/rtc/rtc-rv3032.c
@@ -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));
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
  2021-10-12 10:10 [PATCH v2] rtc: rv3032: fix error handling in rv3032_clkout_set_rate() Dan Carpenter
@ 2021-10-15 19:12 ` Alexandre Belloni
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Belloni @ 2021-10-15 19:12 UTC (permalink / raw)
  To: Alessandro Zummo, Dan Carpenter
  Cc: Alexandre Belloni, linux-rtc, kernel-janitors

On Tue, 12 Oct 2021 13:10:28 +0300, Dan Carpenter wrote:
> Do not call rv3032_exit_eerd() if the enter function fails but don't
> forget to call the exit when the enter succeeds.
> 
> 

Applied, thanks!

[1/1] rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
      commit: c3336b8ac6091df60a5c1049a8c685d0b947cc61

Best regards,
-- 
Alexandre Belloni <alexandre.belloni@bootlin.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-15 19:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 10:10 [PATCH v2] rtc: rv3032: fix error handling in rv3032_clkout_set_rate() Dan Carpenter
2021-10-15 19:12 ` Alexandre Belloni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).