]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm: Release resources with a safer function
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 2 Oct 2016 06:01:22 +0000 (08:01 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Oct 2016 13:16:54 +0000 (15:16 +0200)
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
drivers/gpu/drm/drm_connector.c

index 26bb78c76481dabdf834630c3ce706b73fa81112..2e74302830437ae131079b98d691370bce5d9e82 100644 (file)
@@ -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);