From 81bf8895812b76909dbcf88708d4f76193ae7ded Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 27 Oct 2012 16:16:34 -0300 Subject: [PATCH] --- yaml --- r: 343846 b: refs/heads/master c: ba4008921ba8144ff307f10d04fe52e6d6e744dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/soc_camera/ov2640.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e644ec303a4d..b12cad7ddee4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 830e4b55b02b8a2638958e4249eba71797940ee5 +refs/heads/master: ba4008921ba8144ff307f10d04fe52e6d6e744dc diff --git a/trunk/drivers/media/i2c/soc_camera/ov2640.c b/trunk/drivers/media/i2c/soc_camera/ov2640.c index d2d298b6354e..30cf6d8b7b8b 100644 --- a/trunk/drivers/media/i2c/soc_camera/ov2640.c +++ b/trunk/drivers/media/i2c/soc_camera/ov2640.c @@ -896,12 +896,10 @@ static int ov2640_s_fmt(struct v4l2_subdev *sd, static int ov2640_try_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) { - const struct ov2640_win_size *win; - /* - * select suitable win + * select suitable win, but don't store it */ - win = ov2640_select_win(&mf->width, &mf->height); + ov2640_select_win(&mf->width, &mf->height); mf->field = V4L2_FIELD_NONE;