[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221118063840.6357-3-srinivas.kandagatla@linaro.org>
Date: Fri, 18 Nov 2022 06:38:38 +0000
From: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
To: gregkh@...uxfoundation.org
Cc: linux-kernel@...r.kernel.org, Wei Yongjun <weiyongjun1@...wei.com>,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
Nicolas Saenz Julienne <nsaenzjulienne@...e.de>,
Yang Yingliang <yangyingliang@...wei.com>
Subject: [PATCH 2/4] nvmem: rmem: Fix return value check in rmem_read()
From: Wei Yongjun <weiyongjun1@...wei.com>
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@...aro.org>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@...e.de>
Signed-off-by: Wei Yongjun <weiyongjun1@...wei.com>
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@...e.de>
Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
---
drivers/nvmem/rmem.c | 4 ++--
1 file 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);
--
2.25.1
Powered by blists - more mailing lists