lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 693/849] rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ 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>
    ---
    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 d63102d5cb1e4..1b62ed2f14594 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.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:16    [W:2.854 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site