summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/media-entity.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 5f61642b2a97..07f2dc6c2df6 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -222,6 +222,7 @@ int
media_entity_init(struct media_entity *entity, u16 num_pads,
struct media_pad *pads)
{
+ struct media_device *mdev = entity->graph_obj.mdev;
unsigned int i;
entity->group_id = 0;
@@ -230,11 +231,20 @@ media_entity_init(struct media_entity *entity, u16 num_pads,
entity->num_pads = num_pads;
entity->pads = pads;
+ if (mdev)
+ spin_lock(&mdev->lock);
+
for (i = 0; i < num_pads; i++) {
pads[i].entity = entity;
pads[i].index = i;
+ if (mdev)
+ media_gobj_init(mdev, MEDIA_GRAPH_PAD,
+ &entity->pads[i].graph_obj);
}
+ if (mdev)
+ spin_unlock(&mdev->lock);
+
return 0;
}
EXPORT_SYMBOL_GPL(media_entity_init);