summaryrefslogtreecommitdiff
path: root/isp/omap3isp.c
diff options
context:
space:
mode:
Diffstat (limited to 'isp/omap3isp.c')
-rw-r--r--isp/omap3isp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/isp/omap3isp.c b/isp/omap3isp.c
index ac9cc4a..7ff2d7e 100644
--- a/isp/omap3isp.c
+++ b/isp/omap3isp.c
@@ -637,7 +637,7 @@ static int omap3_isp_pipeline_try_format(struct omap3_isp_device *isp,
* Otherwise scale as much as possible on the sensor.
*/
if (scaler == OMAP3_ISP_SCALER_ISP)
- format = isp->sensor_format;
+ format = isp->sensor.format;
else
format = *ofmt;
@@ -939,11 +939,9 @@ struct omap3_isp_device *omap3_isp_open(const char *devname,
isp->sensor.entity = entity;
- /* Retrieve the sensor default format. */
- ret = v4l2_subdev_get_format(isp->sensor.entity, &isp->sensor_format, 0,
- V4L2_SUBDEV_FORMAT_TRY);
+ ret = omap3_isp_sensor_init(isp);
if (ret < 0) {
- printf("error: unable to get sensor default format.\n");
+ printf("error: unable to initialize sensor.\n");
goto error;
}