浏览代码

[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>
Mauro Carvalho Chehab 9 年之前
父节点
当前提交
5c883edb5b
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/media/media-entity.c

+ 2 - 2
drivers/media/media-entity.c

@@ -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;
 }