Commit ba1c30bf authored by Dan Carpenter's avatar Dan Carpenter Committed by Alexandre Belloni

rtc: pcf2127: fix pcf2127_nvmem_read/write() returns

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: d6c3029f ("rtc: pcf2127: add support for accessing internal static RAM")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201022070451.GA2817669@mwanda
parent 5d78533a
...@@ -243,10 +243,8 @@ static int pcf2127_nvmem_read(void *priv, unsigned int offset, ...@@ -243,10 +243,8 @@ static int pcf2127_nvmem_read(void *priv, unsigned int offset,
if (ret) if (ret)
return ret; return ret;
ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_RAM_RD_CMD, return regmap_bulk_read(pcf2127->regmap, PCF2127_REG_RAM_RD_CMD,
val, bytes); val, bytes);
return ret ?: bytes;
} }
static int pcf2127_nvmem_write(void *priv, unsigned int offset, static int pcf2127_nvmem_write(void *priv, unsigned int offset,
...@@ -261,10 +259,8 @@ 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) if (ret)
return ret; return ret;
ret = regmap_bulk_write(pcf2127->regmap, PCF2127_REG_RAM_WRT_CMD, return regmap_bulk_write(pcf2127->regmap, PCF2127_REG_RAM_WRT_CMD,
val, bytes); val, bytes);
return ret ?: bytes;
} }
/* watchdog driver */ /* watchdog driver */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment