aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov7670.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2010-03-26 12:09:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:51:25 -0400
commit380de498e264cca27d19deafe4dc44f624820d09 (patch)
treeaddef5744f581d4553ebd628d6916e1eaf0a181b /drivers/media/video/ov7670.c
parenta8e68c37c846236499ac05e95af76dff2e9aa1eb (diff)
V4L/DVB: ov7670: silence some compiler warnings
Get rid of some "unused variable" warnings. These were the result of sloppiness and should not have happened; I'll go stand in the corner now. Reported-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r--drivers/media/video/ov7670.c7
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