lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 017/717] rtc: pcf2127: fix pcf2127_nvmem_read/write() returns
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit ba1c30bf3f2536f248d262c6f257b5a787305991 ]

    These functions should return zero on success. Non-zero returns are
    treated as error. On some paths, this doesn't matter but in
    nvmem_cell_read() a non-zero return would be passed to ERR_PTR() and
    lead to an Oops.

    Fixes: d6c3029f32f7 ("rtc: pcf2127: add support for accessing internal static RAM")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Link: https://lore.kernel.org/r/20201022070451.GA2817669@mwanda
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/rtc/rtc-pcf2127.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c
    index 07a5630ec841f..4d9711d51f8f3 100644
    --- a/drivers/rtc/rtc-pcf2127.c
    +++ b/drivers/rtc/rtc-pcf2127.c
    @@ -243,10 +243,8 @@ static int pcf2127_nvmem_read(void *priv, unsigned int offset,
    if (ret)
    return ret;

    - ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_RAM_RD_CMD,
    - val, bytes);
    -
    - return ret ?: bytes;
    + return regmap_bulk_read(pcf2127->regmap, PCF2127_REG_RAM_RD_CMD,
    + val, bytes);
    }

    static int pcf2127_nvmem_write(void *priv, unsigned int offset,
    @@ -261,10 +259,8 @@ static int pcf2127_nvmem_write(void *priv, unsigned int offset,
    if (ret)
    return ret;

    - ret = regmap_bulk_write(pcf2127->regmap, PCF2127_REG_RAM_WRT_CMD,
    - val, bytes);
    -
    - return ret ?: bytes;
    + return regmap_bulk_write(pcf2127->regmap, PCF2127_REG_RAM_WRT_CMD,
    + val, bytes);
    }

    /* watchdog driver */
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:23    [W:2.762 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site