Skip to contentSkip to conversation

drm/edid: checking for NULL instead of IS_ERR

PATCH In review Dan Carpenter 2 participants 2 messages Apr 12, 2017

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

PATCH 1/1 drm/edid: checking for NULL instead of IS_ERR

drm_mode_create_tile_group() uses error pointers, it doesn't return NULL. I re-arranged it a tiny bit to be more clear.

Fixes 40d9b043a89e ("drm/connector: store tile information from displayid (v3)")
drivers/gpu/drm/drm_edid.c +2 -2
index fad3d44e4642..c6bc21673885 100644
@@ -4522,9 +4522,9 @@ static int drm_parse_tiled_block(struct drm_connector *connector,
 	tg = drm_mode_get_tile_group(connector->dev, tile->topology_id);
 	if (!tg) {
 		tg = drm_mode_create_tile_group(connector->dev, tile->topology_id);
+		if (IS_ERR(tg))
+			return PTR_ERR(tg);
 	}
-	if (!tg)
-		return -ENOMEM;
 
 	if (connector->tile_group != tg) {
 		/* if we haven't got a pointer,
#1 lore raw
Quoted 5 lines · Dan Carpenter

drm_mode_create_tile_group() uses error pointers, it doesn't return NULL. I re-arranged it a tiny bit to be more clear.

Fixes 40d9b043a89e ("drm/connector: store tile information from displayid (v3)")

There's a second caller in msm, which is also broken. I feel like fixing create_tile_group is easier (plus updating the docs). -Daniel

Quoted 21 lines
drivers/gpu/drm/drm_edid.c +2 -2
index fad3d44e4642..c6bc21673885 100644
@@ -4522,9 +4522,9 @@ static int drm_parse_tiled_block(struct drm_connector *connector,
 	tg = drm_mode_get_tile_group(connector->dev, tile->topology_id);
 	if (!tg) {
 		tg = drm_mode_create_tile_group(connector->dev, tile->topology_id);
+		if (IS_ERR(tg))
+			return PTR_ERR(tg);
 	}
-	if (!tg)
-		return -ENOMEM;
 
 	if (connector->tile_group != tg) {
 		/* if we haven't got a pointer,

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch