diff --git a/[refs] b/[refs]
index 0a4b576ca29e..37d5610bcb46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8e68c37c846236499ac05e95af76dff2e9aa1eb
+refs/heads/master: 380de498e264cca27d19deafe4dc44f624820d09
diff --git a/trunk/drivers/media/video/ov7670.c b/trunk/drivers/media/video/ov7670.c
index 82d37d925eb4..91c886ab15c6 100644
--- a/trunk/drivers/media/video/ov7670.c
+++ b/trunk/drivers/media/video/ov7670.c
@@ -874,8 +874,7 @@ static int ov7670_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms)
 	struct v4l2_captureparm *cp = &parms->parm.capture;
 	struct v4l2_fract *tpf = &cp->timeperframe;
 	struct ov7670_info *info = to_state(sd);
-	unsigned char clkrc;
-	int ret, div;
+	int div;
 
 	if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 		return -EINVAL;
@@ -1281,9 +1280,9 @@ static int ov7670_g_autoexp(struct v4l2_subdev *sd, __s32 *value)
 
 	ret = ov7670_read(sd, REG_COM8, &com8);
 	if (com8 & COM8_AEC)
-		*value = V4L2_EXPOSURE_AUTO;
+		*atype = V4L2_EXPOSURE_AUTO;
 	else
-		*value = V4L2_EXPOSURE_MANUAL;
+		*atype = V4L2_EXPOSURE_MANUAL;
 	return ret;
 }