UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media-entity: use mutes for link setup 

Changeset f8fd4c61b5ae ("[media] media-entity: protect object
creation/removal using spin lock") changed the object creation/removal
protection to spin lock, as this is what's used on media-device,
keeping the mutex reserved for graph traversal routines. However, it
also changed the link setup, by mistake.

This could cause troubles, as the link setup can affect the graph
traversal, and this is likely the reason for a mutex there.

So, revert media_entity_setup_link() to use mutex.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-12-15 07:58:18 -02:00
parent 75c7e29570
commit 5c883edb5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/media-entity.c
View File

@ -662,9 +662,9 @@ int media_entity_setup_link(struct media_link *link, u32 flags)
{
int ret;
spin_lock(&link->source->entity->graph_obj.mdev->lock);
mutex_lock(&link->graph_obj.mdev->graph_mutex);
ret = __media_entity_setup_link(link, flags);
spin_unlock(&link->source->entity->graph_obj.mdev->lock);
mutex_unlock(&link->graph_obj.mdev->graph_mutex);
return ret;
}