Skip to content

Commit 58e92c4

Browse files
Wei Yongjungregkh
authored andcommitted
nvmem: rmem: Fix return value check in rmem_read()
In case of error, the function memremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 5a3fa75 ("nvmem: Add driver to expose reserved memory as nvmem") Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20221118063840.6357-3-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9919d41 commit 58e92c4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/nvmem/rmem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ static int rmem_read(void *context, unsigned int offset,
3737
* but as of Dec 2020 this isn't possible on arm64.
3838
*/
3939
addr = memremap(priv->mem->base, available, MEMREMAP_WB);
40-
if (IS_ERR(addr)) {
40+
if (!addr) {
4141
dev_err(priv->dev, "Failed to remap memory region\n");
42-
return PTR_ERR(addr);
42+
return -ENOMEM;
4343
}
4444

4545
count = memory_read_from_buffer(val, bytes, &off, addr, available);

0 commit comments

Comments
 (0)