mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
nvmem: properly handle returned value nvmem_reg_read
[ Upstream commit 50808bfcc1
]
Function nvmem_reg_read can return a non zero value indicating an error.
This returned value must be read and error propagated to
nvmem_cell_prepare_write_buffer. Silence the following gcc warning (W=1):
drivers/nvmem/core.c:1093:9: warning: variable 'rc' set but
not used [-Wunused-but-set-variable]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
202a0cf0c0
commit
30ac755c76
1 changed files with 7 additions and 0 deletions
|
@ -1031,6 +1031,8 @@ static inline void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell,
|
|||
|
||||
/* setup the first byte with lsb bits from nvmem */
|
||||
rc = nvmem_reg_read(nvmem, cell->offset, &v, 1);
|
||||
if (rc)
|
||||
goto err;
|
||||
*b++ |= GENMASK(bit_offset - 1, 0) & v;
|
||||
|
||||
/* setup rest of the byte if any */
|
||||
|
@ -1049,11 +1051,16 @@ static inline void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell,
|
|||
/* setup the last byte with msb bits from nvmem */
|
||||
rc = nvmem_reg_read(nvmem,
|
||||
cell->offset + cell->bytes - 1, &v, 1);
|
||||
if (rc)
|
||||
goto err;
|
||||
*p |= GENMASK(7, (nbits + bit_offset) % BITS_PER_BYTE) & v;
|
||||
|
||||
}
|
||||
|
||||
return buf;
|
||||
err:
|
||||
kfree(buf);
|
||||
return ERR_PTR(rc);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue