* [PATCH] drm/edid: checking for NULL instead of IS_ERR
@ 2017-04-12 8:33 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2017-04-12 8:33 UTC (permalink / raw)
To: Daniel Vetter, David Airlie; +Cc: kernel-janitors, dri-devel
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)")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index fad3d44e4642..c6bc21673885 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -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,
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] drm/edid: checking for NULL instead of IS_ERR
@ 2017-04-12 8:33 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2017-04-12 8:33 UTC (permalink / raw)
To: Daniel Vetter, David Airlie; +Cc: kernel-janitors, dri-devel
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)")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index fad3d44e4642..c6bc21673885 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -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
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/edid: checking for NULL instead of IS_ERR
2017-04-12 8:33 ` Dan Carpenter
@ 2017-04-12 9:01 ` Daniel Vetter
-1 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2017-04-12 9:01 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Daniel Vetter, kernel-janitors, dri-devel
On Wed, Apr 12, 2017 at 11:33:50AM +0300, Dan Carpenter wrote:
> 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)")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
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
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index fad3d44e4642..c6bc21673885 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -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
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/edid: checking for NULL instead of IS_ERR
@ 2017-04-12 9:01 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2017-04-12 9:01 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Daniel Vetter, kernel-janitors, dri-devel
On Wed, Apr 12, 2017 at 11:33:50AM +0300, Dan Carpenter wrote:
> 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)")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
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
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index fad3d44e4642..c6bc21673885 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -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
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-12 9:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12 8:33 [PATCH] drm/edid: checking for NULL instead of IS_ERR Dan Carpenter
2017-04-12 8:33 ` Dan Carpenter
2017-04-12 9:01 ` Daniel Vetter
2017-04-12 9:01 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.