Skip to contentSkip to conversation

drm/udl: Fix missing error code in udl_handle_damage()

PATCH In review Dan Carpenter 2 participants 2 messages Nov 13, 2020

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

PATCH 1/1 drm/udl: Fix missing error code in udl_handle_damage()

If udl_get_urb() fails then this should return a negative error code but currently it returns success.

Fixes 798ce3fe1c3a ("drm/udl: Begin/end access to imported buffers in damage-handler")
---
 drivers/gpu/drm/udl/udl_modeset.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/udl/udl_modeset.c +3 -1
index 42eeba1dfdbf..9d34ec9d03f6 100644
@@ -305,8 +305,10 @@ static int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
 	vaddr = map.vaddr; /* TODO: Use mapping abstraction properly */
 
 	urb = udl_get_urb(dev);
-	if (!urb)
+	if (!urb) {
+		ret = -ENOMEM;
 		goto out_drm_gem_shmem_vunmap;
+	}
 	cmd = urb->transfer_buffer;
 
 	for (i = clip.y1; i < clip.y2; i++) {
Signature · 1 line
2.28.0
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi

Am 13.11.20 um 11:15 schrieb Dan Carpenter:

Quoted 5 lines

If udl_get_urb() fails then this should return a negative error code but currently it returns success.

Fixes 798ce3fe1c3a ("drm/udl: Begin/end access to imported buffers in damage-handler")

Thanks for the patch. As it has a Fixes tag, it's probably worth taking for silencing compiler warnings alone. I'll add it to the tree.

In practice, it doesn't really matter. udl_handle_damage() is running during the DRM commit phase and it's too late to handle errors. We could as well convert the the function to void.

Best regards
Thomas

Quoted 21 lines
---
 drivers/gpu/drm/udl/udl_modeset.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/udl/udl_modeset.c +3 -1
index 42eeba1dfdbf..9d34ec9d03f6 100644
@@ -305,8 +305,10 @@ static int udl_handle_damage(struct drm_framebuffer *fb, int x, int y,
 	vaddr = map.vaddr; /* TODO: Use mapping abstraction properly */
 
 	urb = udl_get_urb(dev);
-	if (!urb)
+	if (!urb) {
+		ret = -ENOMEM;
 		goto out_drm_gem_shmem_vunmap;
+	}
 	cmd = urb->transfer_buffer;
 
 	for (i = clip.y1; i < clip.y2; i++) {
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: Felix Imendörffer