diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-08-16 13:06:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-01 13:56:33 -0400 |
commit | 5d33ee92ac2556ab1e53db4644af672e2e136013 (patch) | |
tree | 9b286c12e4ad9f1283fdd6a464cbea676da72170 /drivers/media | |
parent | e169c9baa31b23d8e0641359772c47291c485c14 (diff) |
[media] s5p-fimc: Fix setup of initial links to FIMC entities
This patch fixes regression introduced in commit
4af813108b880e96a4b8b01e162f950a4aaa2475. Missing pointers
to the sensor subdevs are restored along with subdev callback
notifications to a corresponding FIMC instance driver.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/s5p-fimc/fimc-mdevice.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 3c76bd948fdb..e2aa8d99d858 100644 --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c | |||
@@ -617,6 +617,7 @@ static int __fimc_md_create_flite_source_links(struct fimc_md *fmd) | |||
617 | */ | 617 | */ |
618 | static int fimc_md_create_links(struct fimc_md *fmd) | 618 | static int fimc_md_create_links(struct fimc_md *fmd) |
619 | { | 619 | { |
620 | struct v4l2_subdev *csi_sensors[2] = { NULL }; | ||
620 | struct v4l2_subdev *sensor, *csis; | 621 | struct v4l2_subdev *sensor, *csis; |
621 | struct s5p_fimc_isp_info *pdata; | 622 | struct s5p_fimc_isp_info *pdata; |
622 | struct fimc_sensor_info *s_info; | 623 | struct fimc_sensor_info *s_info; |
@@ -659,6 +660,7 @@ static int fimc_md_create_links(struct fimc_md *fmd) | |||
659 | sensor->entity.name, csis->entity.name); | 660 | sensor->entity.name, csis->entity.name); |
660 | 661 | ||
661 | source = NULL; | 662 | source = NULL; |
663 | csi_sensors[pdata->mux_id] = sensor; | ||
662 | break; | 664 | break; |
663 | 665 | ||
664 | case FIMC_ITU_601...FIMC_ITU_656: | 666 | case FIMC_ITU_601...FIMC_ITU_656: |
@@ -684,9 +686,10 @@ static int fimc_md_create_links(struct fimc_md *fmd) | |||
684 | continue; | 686 | continue; |
685 | source = &fmd->csis[i].sd->entity; | 687 | source = &fmd->csis[i].sd->entity; |
686 | pad = CSIS_PAD_SOURCE; | 688 | pad = CSIS_PAD_SOURCE; |
689 | sensor = csi_sensors[i]; | ||
687 | 690 | ||
688 | link_mask = 1 << fimc_id++; | 691 | link_mask = 1 << fimc_id++; |
689 | ret = __fimc_md_create_fimc_sink_links(fmd, source, NULL, | 692 | ret = __fimc_md_create_fimc_sink_links(fmd, source, sensor, |
690 | pad, link_mask); | 693 | pad, link_mask); |
691 | } | 694 | } |
692 | 695 | ||