aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/s5p-fimc/fimc-capture.c2
-rw-r--r--drivers/media/platform/soc_camera/soc_camera.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-fimc/fimc-capture.c b/drivers/media/platform/s5p-fimc/fimc-capture.c
index 40923885977a..ac2ca36039e4 100644
--- a/drivers/media/platform/s5p-fimc/fimc-capture.c
+++ b/drivers/media/platform/s5p-fimc/fimc-capture.c
@@ -472,7 +472,7 @@ int fimc_capture_ctrls_create(struct fimc_dev *fimc)
472 return ret; 472 return ret;
473 473
474 return v4l2_ctrl_add_handler(&vid_cap->ctx->ctrls.handler, 474 return v4l2_ctrl_add_handler(&vid_cap->ctx->ctrls.handler,
475 fimc->pipeline.subdevs[IDX_SENSOR]->ctrl_handler); 475 fimc->pipeline.subdevs[IDX_SENSOR]->ctrl_handler, NULL);
476} 476}
477 477
478static int fimc_capture_set_default_format(struct fimc_dev *fimc); 478static int fimc_capture_set_default_format(struct fimc_dev *fimc);
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index f6b1c1f87761..3be92944f8e7 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1184,7 +1184,7 @@ static int soc_camera_probe(struct soc_camera_device *icd)
1184 sd->grp_id = soc_camera_grp_id(icd); 1184 sd->grp_id = soc_camera_grp_id(icd);
1185 v4l2_set_subdev_hostdata(sd, icd); 1185 v4l2_set_subdev_hostdata(sd, icd);
1186 1186
1187 if (v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler)) 1187 if (v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler, NULL))
1188 goto ectrl; 1188 goto ectrl;
1189 1189
1190 /* At this point client .probe() should have run already */ 1190 /* At this point client .probe() should have run already */