summaryrefslogtreecommitdiff
path: root/drivers/firmware/google
diff options
context:
space:
mode:
authorPeng Wu <wupeng58@huawei.com>2022-11-15 12:11:38 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-23 22:03:14 +0300
commitfa1ba41c17cd786925720bc1a9554d6c6624923d (patch)
tree3847d59c205d9615338d38ee87ea165e20feb9be /drivers/firmware/google
parentab760791c0cfbb1d7a668f46a135264f56c8f018 (diff)
downloadlinux-fa1ba41c17cd786925720bc1a9554d6c6624923d.tar.xz
firmware: google: fix a NULL vs IS_ERR() check in cbmem_entry_probe()
The devm_memremap() function returns error pointers on error, it doesn't return NULL. Fixes: 19d54020883c ("firmware: google: Implement cbmem in sysfs driver") Signed-off-by: Peng Wu <wupeng58@huawei.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Link: https://lore.kernel.org/r/20221115091138.51614-1-wupeng58@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/google')
-rw-r--r--drivers/firmware/google/cbmem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbmem.c
index 685f3070ce9d..88e587ba1e0d 100644
--- a/drivers/firmware/google/cbmem.c
+++ b/drivers/firmware/google/cbmem.c
@@ -106,8 +106,8 @@ static int cbmem_entry_probe(struct coreboot_device *dev)
entry->mem_file_buf = devm_memremap(&dev->dev, dev->cbmem_entry.address,
dev->cbmem_entry.entry_size,
MEMREMAP_WB);
- if (!entry->mem_file_buf)
- return -ENOMEM;
+ if (IS_ERR(entry->mem_file_buf))
+ return PTR_ERR(entry->mem_file_buf);
entry->size = dev->cbmem_entry.entry_size;