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: init pads on entity init if was registered before 

If an entity is registered with a media device before is initialized
with media_device_register_entity(), the number of pads won't be set
so media_device_register_entity() won't create pad objects and add
it to the media device pads list.

Do this at entity initialization time if the entity was registered
before so the graph is complete and correct regardless of the order
in which the entities are initialized and registered.

Suggested-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Javier Martinez Canillas 2015-09-08 14:10:56 -03:00 committed by Mauro Carvalho Chehab
parent 9033b1a470
commit db141a355d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,6 +222,7 @@ int
media_entity_init(struct media_entity *entity, u16 num_pads, media_entity_init(struct media_entity *entity, u16 num_pads,
struct media_pad *pads) struct media_pad *pads)
{ {
struct media_device *mdev = entity->graph_obj.mdev;
unsigned int i; unsigned int i;
entity->group_id = 0; entity->group_id = 0;
@ -230,11 +231,20 @@ media_entity_init(struct media_entity *entity, u16 num_pads,
entity->num_pads = num_pads; entity->num_pads = num_pads;
entity->pads = pads; entity->pads = pads;
if (mdev)
spin_lock(&mdev->lock);
for (i = 0; i < num_pads; i++) { for (i = 0; i < num_pads; i++) {
pads[i].entity = entity; pads[i].entity = entity;
pads[i].index = i; 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; return 0;
} }
EXPORT_SYMBOL_GPL(media_entity_init); EXPORT_SYMBOL_GPL(media_entity_init);