Skip to contentSkip to conversation

drm: rcar-du: Fix a NULL vs IS_ERR() bug

PATCH In review Dan Carpenter 3 participants 3 messages Feb 27, 2023

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

PATCH 1/1 drm: rcar-du: Fix a NULL vs IS_ERR() bug

The drmm_encoder_alloc() function returns error pointers. It never returns NULL. Fix the check accordingly.

Fixes 7a1adbd23990 ("drm: rcar-du: Use drmm_encoder_alloc() to manage encoder")
---
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_encoder.c +2 -2
index b1787be31e92..7ecec7b04a8d 100644
@@ -109,8 +109,8 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 	renc = drmm_encoder_alloc(&rcdu->ddev, struct rcar_du_encoder, base,
 				  &rcar_du_encoder_funcs, DRM_MODE_ENCODER_NONE,
 				  NULL);
-	if (!renc)
-		return -ENOMEM;
+	if (IS_ERR(renc))
+		return PTR_ERR(renc);
 
 	renc->output = output;
 
Signature · 1 line
2.39.1
Reviewed-by on v1 1/1
#1 lore raw

Quoting Dan Carpenter (2023-02-27 10:06:59)

Quoted 2 lines

The drmm_encoder_alloc() function returns error pointers. It never returns NULL. Fix the check accordingly.

Yes, indeed. Thanks.

Quoted 25 lines
Fixes 7a1adbd23990 ("drm: rcar-du: Use drmm_encoder_alloc() to manage encoder")
---
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_encoder.c +2 -2
index b1787be31e92..7ecec7b04a8d 100644
@@ -109,8 +109,8 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
        renc = drmm_encoder_alloc(&rcdu->ddev, struct rcar_du_encoder, base,
                                  &rcar_du_encoder_funcs, DRM_MODE_ENCODER_NONE,
                                  NULL);
-       if (!renc)
-               return -ENOMEM;
+       if (IS_ERR(renc))
+               return PTR_ERR(renc);
 
        renc->output = output;
 
Signature · 1 line
2.39.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Dan Carpenter

Hi Dan,

Thank you for the patch.

Quoted 5 lines · Dan Carpenter

The drmm_encoder_alloc() function returns error pointers. It never returns NULL. Fix the check accordingly.

Fixes 7a1adbd23990 ("drm: rcar-du: Use drmm_encoder_alloc() to manage encoder")
Quoted 19 lines
---
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_encoder.c +2 -2
index b1787be31e92..7ecec7b04a8d 100644
@@ -109,8 +109,8 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
 	renc = drmm_encoder_alloc(&rcdu->ddev, struct rcar_du_encoder, base,
 				  &rcar_du_encoder_funcs, DRM_MODE_ENCODER_NONE,
 				  NULL);
-	if (!renc)
-		return -ENOMEM;
+	if (IS_ERR(renc))
+		return PTR_ERR(renc);
 
 	renc->output = output;
 
Signature · 3 lines
Regards,

Laurent Pinchart