diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2022-11-18 06:38:38 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 18:21:58 +0100 |
| commit | 58e92c4a496b27156020a59a98c7f4a92c2b1533 (patch) | |
| tree | df88d5bb40a2ea196676abaf8176bdb0025ec9a5 /drivers/nvmem | |
| parent | 9919d41809fb32bfdd5d7dc53345f83b89e33feb (diff) | |
| download | linux-stable-58e92c4a496b27156020a59a98c7f4a92c2b1533.tar.gz linux-stable-58e92c4a496b27156020a59a98c7f4a92c2b1533.tar.bz2 linux-stable-58e92c4a496b27156020a59a98c7f4a92c2b1533.zip | |
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: 5a3fa75a4d9c ("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>
Diffstat (limited to 'drivers/nvmem')
| -rw-r--r-- | drivers/nvmem/rmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c index b11c3c974b3d..80cb187f1481 100644 --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -37,9 +37,9 @@ static int rmem_read(void *context, unsigned int offset, * but as of Dec 2020 this isn't possible on arm64. */ addr = memremap(priv->mem->base, available, MEMREMAP_WB); - if (IS_ERR(addr)) { + if (!addr) { dev_err(priv->dev, "Failed to remap memory region\n"); - return PTR_ERR(addr); + return -ENOMEM; } count = memory_read_from_buffer(val, bytes, &off, addr, available); |