summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2016-10-02 08:01:22 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-10-05 15:16:54 +0200
commit587680c1c52d73bc7d5dbba2dcfadacb7a3f6b0e (patch)
tree0706cf37def55b3a4a37b2b2e51f5f7899101a05 /drivers/gpu
parentdrm/rockchip: analogix_dp: Refuse to enable PSR if panel doesn't support it (diff)
downloadlinux-587680c1c52d73bc7d5dbba2dcfadacb7a3f6b0e.tar.xz
linux-587680c1c52d73bc7d5dbba2dcfadacb7a3f6b0e.zip
drm: Release resources with a safer function
We should use 'ida_simple_remove()' instead of 'ida_remove()' when freeing resources allocated with 'ida_simple_get()'. This as been spotted with the following coccinelle script which tries to detect missing 'ida_simple_remove()' call in error handling paths. /////////////// @@ expression x; identifier l; @@ * x = ida_simple_get(...); ... if (...) { ... } ... if (...) { ... goto l; } ... * l: ... when != ida_simple_remove(...); Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1475388082-12656-1-git-send-email-christophe.jaillet@wanadoo.fr
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_connector.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 26bb78c76481..2e7430283043 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -250,10 +250,10 @@ int drm_connector_init(struct drm_device *dev,
connector->debugfs_entry = NULL;
out_put_type_id:
if (ret)
- ida_remove(connector_ida, connector->connector_type_id);
+ ida_simple_remove(connector_ida, connector->connector_type_id);
out_put_id:
if (ret)
- ida_remove(&config->connector_ida, connector->index);
+ ida_simple_remove(&config->connector_ida, connector->index);
out_put:
if (ret)
drm_mode_object_unregister(dev, &connector->base);