Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331199
b: refs/heads/master
c: 5d33ee9
h: refs/heads/master
i:
  331197: 78de441
  331195: 0e7d04b
  331191: 4f9bcba
  331183: 9500816
  331167: 69258b9
  331135: 15c8905
v: v3
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Oct 1, 2012
1 parent 802c665 commit af61ee1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e169c9baa31b23d8e0641359772c47291c485c14
refs/heads/master: 5d33ee92ac2556ab1e53db4644af672e2e136013
5 changes: 4 additions & 1 deletion trunk/drivers/media/platform/s5p-fimc/fimc-mdevice.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand All @@ -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);
}

Expand Down

0 comments on commit af61ee1

Please sign in to comment.