From af61ee1e8d079efb5e5a519238c2fb90e492359d Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 16 Aug 2012 14:06:41 -0300 Subject: [PATCH] --- yaml --- r: 331199 b: refs/heads/master c: 5d33ee92ac2556ab1e53db4644af672e2e136013 h: refs/heads/master i: 331197: 78de44120bd3d8bfd4fca5150bfcb70828285a60 331195: 0e7d04bac8eee0f366f468806cecddb2c59f7552 331191: 4f9bcba94dc334674aae681c76a6aa1de9cd7724 331183: 9500816f0a69240a519927832a27450a60e5e08b 331167: 69258b95f43c2c86df85ce8552434f97d822bf89 331135: 15c8905f548f08189a3ef99132b540ea67056087 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7bb3c6d6c5b2..cfd83983be51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e169c9baa31b23d8e0641359772c47291c485c14 +refs/heads/master: 5d33ee92ac2556ab1e53db4644af672e2e136013 diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 3c76bd948fdb..e2aa8d99d858 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/trunk/drivers/media/platform/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); }