From a781737264d8ae154d80056e86cc2fd59881dd81 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 16 Aug 2012 14:06:41 -0300 Subject: [PATCH] --- yaml --- r: 330541 b: refs/heads/master c: 4cdef22480bffe31966b1202ef9c53f46848c469 h: refs/heads/master i: 330539: d119165f57c3ca5a17683143ffbd101388b22002 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e380906be33d..670aebe2096a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7b694d516fa409a4f0a6bae1f2434270b132645 +refs/heads/master: 4cdef22480bffe31966b1202ef9c53f46848c469 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c b/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c index 3c76bd948fdb..e2aa8d99d858 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-mdevice.c @@ -617,6 +617,7 @@ static int __fimc_md_create_flite_source_links(struct fimc_md *fmd) */ static int fimc_md_create_links(struct fimc_md *fmd) { + struct v4l2_subdev *csi_sensors[2] = { NULL }; struct v4l2_subdev *sensor, *csis; struct s5p_fimc_isp_info *pdata; struct fimc_sensor_info *s_info; @@ -659,6 +660,7 @@ static int fimc_md_create_links(struct fimc_md *fmd) sensor->entity.name, csis->entity.name); source = NULL; + csi_sensors[pdata->mux_id] = sensor; break; case FIMC_ITU_601...FIMC_ITU_656: @@ -684,9 +686,10 @@ static int fimc_md_create_links(struct fimc_md *fmd) continue; source = &fmd->csis[i].sd->entity; pad = CSIS_PAD_SOURCE; + sensor = csi_sensors[i]; link_mask = 1 << fimc_id++; - ret = __fimc_md_create_fimc_sink_links(fmd, source, NULL, + ret = __fimc_md_create_fimc_sink_links(fmd, source, sensor, pad, link_mask); }