Skip to content

Commit 9bdd942

Browse files
error27tdz
authored andcommitted
drm/simpledrm: Fix an NULL vs IS_ERR() bug
The devm_memremap() function doesn't return NULL, it returns error pointers. Fixes: 9a10c7e ("drm/simpledrm: Add support for system memory framebuffers") Signed-off-by: Dan Carpenter <error27@gmail.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Thierry Reding <treding@nvidia.com> Link: https://patchwork.freedesktop.org/patch/msgid/Y9JHzImRcUaa0mi1@kili (cherry picked from commit e566507) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
1 parent aebd8f0 commit 9bdd942

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/tiny/simpledrm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
719719
drm_dbg(dev, "using system memory framebuffer at %pr\n", mem);
720720

721721
screen_base = devm_memremap(dev->dev, mem->start, resource_size(mem), MEMREMAP_WC);
722-
if (!screen_base)
723-
return ERR_PTR(-ENOMEM);
722+
if (IS_ERR(screen_base))
723+
return screen_base;
724724

725725
iosys_map_set_vaddr(&sdev->screen_base, screen_base);
726726
} else {

0 commit comments

Comments
 (0)