diff options
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r-- | drivers/media/video/ov7670.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index 82d37d925eb4..91c886ab15c6 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c | |||
@@ -874,8 +874,7 @@ static int ov7670_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms) | |||
874 | struct v4l2_captureparm *cp = &parms->parm.capture; | 874 | struct v4l2_captureparm *cp = &parms->parm.capture; |
875 | struct v4l2_fract *tpf = &cp->timeperframe; | 875 | struct v4l2_fract *tpf = &cp->timeperframe; |
876 | struct ov7670_info *info = to_state(sd); | 876 | struct ov7670_info *info = to_state(sd); |
877 | unsigned char clkrc; | 877 | int div; |
878 | int ret, div; | ||
879 | 878 | ||
880 | if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | 879 | if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) |
881 | return -EINVAL; | 880 | return -EINVAL; |
@@ -1281,9 +1280,9 @@ static int ov7670_g_autoexp(struct v4l2_subdev *sd, __s32 *value) | |||
1281 | 1280 | ||
1282 | ret = ov7670_read(sd, REG_COM8, &com8); | 1281 | ret = ov7670_read(sd, REG_COM8, &com8); |
1283 | if (com8 & COM8_AEC) | 1282 | if (com8 & COM8_AEC) |
1284 | *value = V4L2_EXPOSURE_AUTO; | 1283 | *atype = V4L2_EXPOSURE_AUTO; |
1285 | else | 1284 | else |
1286 | *value = V4L2_EXPOSURE_MANUAL; | 1285 | *atype = V4L2_EXPOSURE_MANUAL; |
1287 | return ret; | 1286 | return ret; |
1288 | } | 1287 | } |
1289 | 1288 | ||