summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorKatsuya Matsubara <matsu@igel.co.jp>2013-07-26 11:32:11 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-18 12:30:46 +0200
commitdb32eb6c18d7617e61ca65eb13b66de4dea56f1f (patch)
tree688c2e14dc0c7bc34b1282eb04c727296c48e3a0 /drivers/media/platform
parent[media] v4l: Renesas R-Car VSP1 driver (diff)
downloadlinux-db32eb6c18d7617e61ca65eb13b66de4dea56f1f.tar.xz
linux-db32eb6c18d7617e61ca65eb13b66de4dea56f1f.zip
[media] vsp1: Fix lack of the sink entity registration for enabled links
Each source entity maintains a pointer to the counterpart sink entity while an enabled link connects them. It should be managed by the setup_link callback in the media controller framework at runtime. However, enabled links which connect RPFs and WPFs that have an equivalent index number are created during initialization. This registers the pointer to a sink entity from the source entity when an enabled link is created. Signed-off-by: Katsuya Matsubara <matsu@igel.co.jp> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/vsp1/vsp1_drv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index e58e49c88415..41dd891d9737 100644
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -101,6 +101,9 @@ static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink)
entity, pad, flags);
if (ret < 0)
return ret;
+
+ if (flags & MEDIA_LNK_FL_ENABLED)
+ source->sink = entity;
}
}