diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-11-10 11:55:39 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-11-15 09:11:58 +0100 |
| commit | 22f2cac62dea739d395007b3ce68def36adafd6c (patch) | |
| tree | 4f2cee597b6694e12400b094d835066694f66545 | |
| parent | media: atomisp-ov2680: initialize return var (diff) | |
| download | linux-22f2cac62dea739d395007b3ce68def36adafd6c.tar.xz linux-22f2cac62dea739d395007b3ce68def36adafd6c.zip | |
media: atomisp-ov2680: properly set the vts value
The vts value should be set before being checked, as otherwise a
warning will arise:
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c: In function 'ov2680_set_fmt':
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:873:33: warning: 'vts' may be used uninitialized
[-Wmaybe-uninitialized]
873 | if (dev->exposure > vts - OV2680_INTEGRATION_TIME_MARGIN)
Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Fixes: 62b984359b6f ("media: atomisp-ov2680: Fix ov2680_set_fmt() messing up high exposure settings")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c index 497884d332e1..d24f8830fd94 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c @@ -869,11 +869,11 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, dev_err(&client->dev, "ov2680 write resolution register err: %d\n", ret); + vts = dev->res->lines_per_frame; + /* If necessary increase the VTS to match exposure + MARGIN */ if (dev->exposure > vts - OV2680_INTEGRATION_TIME_MARGIN) vts = dev->exposure + OV2680_INTEGRATION_TIME_MARGIN; - else - vts = dev->res->lines_per_frame; ret = ov2680_write_reg(client, 2, OV2680_TIMING_VTS_H, vts); if (ret) |