mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

[media] media: move MEDIA_LNK_FL_INTERFACE_LINK logic to link creation

Browse source 
Instead of flagging an interface link as MEDIA_LNK_FL_INTERFACE_LINK
only when returning to userspace, do it at link creation time.

That would allow using such flag internally, and cleans up a
little bit the code for G_TOPOLOGY ioctl.

[mchehab@osg.samsung.com: folded with a fixup from Dan Carpenter,
 replacing & by &&]
Suggested-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-12-11 18:09:13 -02:00
parent 313895fba2
commit 82ae2a5059
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/media-device.c
View file

@ -361,9 +361,6 @@ static long __media_device_get_topology(struct media_device *mdev,
klink.sink_id = link->gobj1->id;
klink.flags = link->flags;
if (media_type(link->gobj0) != MEDIA_GRAPH_PAD)
klink.flags |= MEDIA_LNK_FL_INTERFACE_LINK;
if (copy_to_user(ulink, &klink, sizeof(klink)))
ret = -EFAULT;
ulink++;

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

@ -526,7 +526,7 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,
link->source = &source->pads[source_pad];
link->sink = &sink->pads[sink_pad];
link->flags = flags;
link->flags = flags & ~MEDIA_LNK_FL_INTERFACE_LINK;
/* Initialize graph object embedded at the new link */
media_gobj_create(source->graph_obj.mdev, MEDIA_GRAPH_LINK,
@ -756,7 +756,7 @@ struct media_link *media_create_intf_link(struct media_entity *entity,
link->intf = intf;
link->entity = entity;
link->flags = flags;
link->flags = flags | MEDIA_LNK_FL_INTERFACE_LINK;
/* Initialize graph object embedded at the new link */
media_gobj_create(intf->graph_obj.mdev, MEDIA_GRAPH_LINK,