[PATCH v8 51/55] [media] remove interface links at media_entity_unregister()

[Mauro Carvalho Chehab]

Interface links connected to an entity should be removed
before being able of removing the entity.

Signed-off-by: Mauro Carvalho Chehab <mche...@osg.samsung.com>

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index a91e1ec076a6..638c682b79c4 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -618,14 +618,30 @@ void media_device_unregister_entity(struct media_entity 
*entity)
                return;
 
        spin_lock(&mdev->lock);
+
+       /* Remove interface links with this entity on it */
+       list_for_each_entry_safe(link, tmp, &mdev->links, graph_obj.list) {
+               if (media_type(link->gobj1) == MEDIA_GRAPH_ENTITY
+                   && link->entity == entity) {
+                       media_gobj_remove(&link->graph_obj);
+                       kfree(link);
+               }
+       }
+
+       /* Remove all data links that belong to this entity */
        list_for_each_entry_safe(link, tmp, &entity->links, list) {
                media_gobj_remove(&link->graph_obj);
                list_del(&link->list);
                kfree(link);
        }
+
+       /* Remove all pads that belong to this entity */
        for (i = 0; i < entity->num_pads; i++)
                media_gobj_remove(&entity->pads[i].graph_obj);
+
+       /* Remove the entity */
        media_gobj_remove(&entity->graph_obj);
+
        spin_unlock(&mdev->lock);
        entity->graph_obj.mdev = NULL;
 }
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html