]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 12 Oct 2021 10:10:28 +0000 (13:10 +0300)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:33 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit c3336b8ac6091df60a5c1049a8c685d0b947cc61 ]

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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20211012101028.GT2083@kadam
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/rtc/rtc-rv3032.c

index d63102d5cb1e4450feab6c66a16fef1ac1c9628a..1b62ed2f1459451c9623f30d4f47d73e023778e4 100644 (file)
@@ -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));