提交 58e92c4a 编写于 作者: W Wei Yongjun 提交者: Greg Kroah-Hartman

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: 5a3fa75a ("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: NWei Yongjun <weiyongjun1@huawei.com>
Acked-by: NNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221118063840.6357-3-srinivas.kandagatla@linaro.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 9919d418
...@@ -37,9 +37,9 @@ static int rmem_read(void *context, unsigned int offset, ...@@ -37,9 +37,9 @@ static int rmem_read(void *context, unsigned int offset,
* but as of Dec 2020 this isn't possible on arm64. * but as of Dec 2020 this isn't possible on arm64.
*/ */
addr = memremap(priv->mem->base, available, MEMREMAP_WB); addr = memremap(priv->mem->base, available, MEMREMAP_WB);
if (IS_ERR(addr)) { if (!addr) {
dev_err(priv->dev, "Failed to remap memory region\n"); 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); count = memory_read_from_buffer(val, bytes, &off, addr, available);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册