diff options
Diffstat (limited to 'isp/controls.c')
| -rw-r--r-- | isp/controls.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/isp/controls.c b/isp/controls.c index 4dc943f..299be5d 100644 --- a/isp/controls.c +++ b/isp/controls.c @@ -170,7 +170,7 @@ int omap3_isp_ccdc_set_black_level(struct omap3_isp_device *isp, unsigned int va memset(&bclamp, 0, sizeof bclamp); bclamp.dcsubval = value; - ret = ioctl(isp->ccdc->fd, VIDIOC_OMAP3ISP_CCDC_CFG, &config); + ret = ioctl(isp->ccdc.entity->fd, VIDIOC_OMAP3ISP_CCDC_CFG, &config); if (ret < 0) return -errno; @@ -230,9 +230,9 @@ int omap3_isp_preview_setup(struct omap3_isp_device *isp) memset(&csc, 0, sizeof csc); matrix_float_to_s10q8(csc.matrix, &omap3isp_preview_csc); - v4l2_subdev_open(isp->preview); + v4l2_subdev_open(isp->preview.entity); - ret = ioctl(isp->preview->fd, VIDIOC_OMAP3ISP_PRV_CFG, &config); + ret = ioctl(isp->preview.entity->fd, VIDIOC_OMAP3ISP_PRV_CFG, &config); if (ret < 0) return -errno; @@ -244,7 +244,7 @@ int omap3_isp_preview_set_contrast(struct omap3_isp_device *isp, unsigned int va int contrast = value; int ret; - ret = v4l2_subdev_set_control(isp->preview, V4L2_CID_CONTRAST, &contrast); + ret = v4l2_subdev_set_control(isp->preview.entity, V4L2_CID_CONTRAST, &contrast); if (ret < 0) return -errno; @@ -276,7 +276,7 @@ int omap3_isp_preview_set_saturation(struct omap3_isp_device *isp, float value) memset(&rgb2rgb, 0, sizeof rgb2rgb); matrix_float_to_s12q8(rgb2rgb.matrix, &saturation); - ret = ioctl(isp->preview->fd, VIDIOC_OMAP3ISP_PRV_CFG, &config); + ret = ioctl(isp->preview.entity->fd, VIDIOC_OMAP3ISP_PRV_CFG, &config); if (ret < 0) return -errno; @@ -300,7 +300,7 @@ int omap3_isp_sensor_get_exposure(struct omap3_isp_device *isp, ctrls[0].id = V4L2_CID_EXPOSURE; - ret = v4l2_subdev_set_controls(isp->sensor, ARRAY_SIZE(ctrls), ctrls); + ret = v4l2_subdev_set_controls(isp->sensor.entity, ARRAY_SIZE(ctrls), ctrls); if (ret < 0) return ret; @@ -316,7 +316,7 @@ int omap3_isp_sensor_set_exposure(struct omap3_isp_device *isp, ctrls[0].id = V4L2_CID_EXPOSURE; ctrls[0].value = exposure; - return v4l2_subdev_set_controls(isp->sensor, ARRAY_SIZE(ctrls), ctrls); + return v4l2_subdev_set_controls(isp->sensor.entity, ARRAY_SIZE(ctrls), ctrls); } int omap3_isp_sensor_set_gains(struct omap3_isp_device *isp, unsigned int red, @@ -333,5 +333,5 @@ int omap3_isp_sensor_set_gains(struct omap3_isp_device *isp, unsigned int red, ctrls[3].id = V4L2_CID_GAIN_BLUE; ctrls[3].value = blue; - return v4l2_subdev_set_controls(isp->sensor, ARRAY_SIZE(ctrls), ctrls); + return v4l2_subdev_set_controls(isp->sensor.entity, ARRAY_SIZE(ctrls), ctrls); } |