Commit 5d33ee92 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab

[media] s5p-fimc: Fix setup of initial links to FIMC entities

This patch fixes regression introduced in commit
4af81310. Missing pointers
to the sensor subdevs are restored along with subdev callback
notifications to a corresponding FIMC instance driver.
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e169c9ba
...@@ -617,6 +617,7 @@ static int __fimc_md_create_flite_source_links(struct fimc_md *fmd) ...@@ -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) static int fimc_md_create_links(struct fimc_md *fmd)
{ {
struct v4l2_subdev *csi_sensors[2] = { NULL };
struct v4l2_subdev *sensor, *csis; struct v4l2_subdev *sensor, *csis;
struct s5p_fimc_isp_info *pdata; struct s5p_fimc_isp_info *pdata;
struct fimc_sensor_info *s_info; struct fimc_sensor_info *s_info;
...@@ -659,6 +660,7 @@ static int fimc_md_create_links(struct fimc_md *fmd) ...@@ -659,6 +660,7 @@ static int fimc_md_create_links(struct fimc_md *fmd)
sensor->entity.name, csis->entity.name); sensor->entity.name, csis->entity.name);
source = NULL; source = NULL;
csi_sensors[pdata->mux_id] = sensor;
break; break;
case FIMC_ITU_601...FIMC_ITU_656: case FIMC_ITU_601...FIMC_ITU_656:
...@@ -684,9 +686,10 @@ static int fimc_md_create_links(struct fimc_md *fmd) ...@@ -684,9 +686,10 @@ static int fimc_md_create_links(struct fimc_md *fmd)
continue; continue;
source = &fmd->csis[i].sd->entity; source = &fmd->csis[i].sd->entity;
pad = CSIS_PAD_SOURCE; pad = CSIS_PAD_SOURCE;
sensor = csi_sensors[i];
link_mask = 1 << fimc_id++; 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); pad, link_mask);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment