Skip to contentSkip to conversation

drm/simpledrm: Fix an NULL vs IS_ERR() bug

PATCH In review Dan Carpenter 3 participants 4 messages Jan 26, 2023 – Feb 1, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/simpledrm: Fix an NULL vs IS_ERR() bug

The devm_memremap() function doesn't return NULL, it returns error pointers.

Fixes 9a10c7e6519b ("drm/simpledrm: Add support for system memory framebuffers")
---
 drivers/gpu/drm/tiny/simpledrm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/simpledrm.c +2 -2
index 2acc0eb32489..63881a3754f8 100644
@@ -719,8 +719,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
 		drm_dbg(dev, "using system memory framebuffer at %pr\n", mem);
 
 		screen_base = devm_memremap(dev->dev, mem->start, resource_size(mem), MEMREMAP_WC);
-		if (!screen_base)
-			return ERR_PTR(-ENOMEM);
+		if (IS_ERR(screen_base))
+			return screen_base;
 
 		iosys_map_set_vaddr(&sdev->screen_base, screen_base);
 	} else {
Signature · 1 line
2.35.1
maintainer Reviewed-by on v1 1/1
#1 lore raw

Am 26.01.23 um 10:28 schrieb Dan Carpenter:

Quoted 5 lines

The devm_memremap() function doesn't return NULL, it returns error pointers.

Fixes 9a10c7e6519b ("drm/simpledrm: Add support for system memory framebuffers")
Quoted 19 lines
---
  drivers/gpu/drm/tiny/simpledrm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/tiny/simpledrm.c +2 -2
index 2acc0eb32489..63881a3754f8 100644
@@ -719,8 +719,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
  		drm_dbg(dev, "using system memory framebuffer at %pr\n", mem);
 
  		screen_base = devm_memremap(dev->dev, mem->start, resource_size(mem), MEMREMAP_WC);
-		if (!screen_base)
-			return ERR_PTR(-ENOMEM);
+		if (IS_ERR(screen_base))
+			return screen_base;
 
  		iosys_map_set_vaddr(&sdev->screen_base, screen_base);
  	} else {
Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
#2 lore raw
In reply to Dan Carpenter
Quoted 8 lines · Dan Carpenter

The devm_memremap() function doesn't return NULL, it returns error pointers.

Fixes 9a10c7e6519b ("drm/simpledrm: Add support for system memory framebuffers")
---
 drivers/gpu/drm/tiny/simpledrm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Good catch! Applied to drm-misc-next, thanks.

Thierry

#3 lore raw

Am 26.01.23 um 17:18 schrieb Thierry Reding:

Quoted 11 lines · Dan Carpenter
Quoted 8 lines

The devm_memremap() function doesn't return NULL, it returns error pointers.

Fixes 9a10c7e6519b ("drm/simpledrm: Add support for system memory framebuffers")
---
  drivers/gpu/drm/tiny/simpledrm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Good catch! Applied to drm-misc-next, thanks.

I have cherry-picked the patch into drm-misc-next-fixes.

Quoted 2 lines

Thierry

Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev