firmware: google: fix a NULL vs IS_ERR() check in cbmem_entry_probe()
authorPeng Wu <wupeng58@huawei.com>
Tue, 15 Nov 2022 09:11:38 +0000 (09:11 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Nov 2022 19:03:14 +0000 (20:03 +0100)
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>
drivers/firmware/google/cbmem.c

index 685f3070ce9d82c93a47a7a06b5783f9095268d9..88e587ba1e0da3f5e9287c3ac42c7a0f4fb82809 100644 (file)
@@ -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;