OSDN Git Service

drm/vmwgfx: Fix return value check in vmw_setup_pci_resources()
authorQiheng Lin <linqiheng@huawei.com>
Fri, 14 May 2021 08:28:12 +0000 (16:28 +0800)
committerZack Rusin <zackr@vmware.com>
Fri, 14 May 2021 18:39:14 +0000 (14:39 -0400)
In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR().
The IS_ERR() test in the return value check should be replaced with NULL test.
After that, the error code -ENOMEM should be returned.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qiheng Lin <linqiheng@huawei.com>
Signed-off-by: Zack Rusin <zackr@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210514082812.1697-1-linqiheng@huawei.com
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

index 5cf3a5b..6f5ea00 100644 (file)
@@ -719,10 +719,10 @@ static int vmw_setup_pci_resources(struct vmw_private *dev,
                dev->rmmio = devm_ioremap(dev->drm.dev,
                                          rmmio_start,
                                          rmmio_size);
-               if (IS_ERR(dev->rmmio)) {
+               if (!dev->rmmio) {
                        DRM_ERROR("Failed mapping registers mmio memory.\n");
                        pci_release_regions(pdev);
-                       return PTR_ERR(dev->rmmio);
+                       return -ENOMEM;
                }
        } else if (pci_id == VMWGFX_PCI_ID_SVGA2) {
                dev->io_start = pci_resource_start(pdev, 0);