From 1922132a4facf53e71855fb3624ab29da99a6fe3 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 20 Oct 2012 20:49:07 +0200 Subject: isp: Emulate global gain for sensors that only expose color gains Signed-off-by: Laurent Pinchart --- isp/omap3isp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'isp/omap3isp.c') 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; } -- cgit v1.2.3