diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2022-08-13 10:30:34 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-09-24 09:32:27 +0200 |
| commit | 44a11920ac39fe7fe5191d72c0822ff2a4c3b83d (patch) | |
| tree | 43411e426a0716baad83cfe91a7941f9a8c933eb /drivers/staging | |
| parent | adea153b4f6537f367fe77abada263fde8a1f7b6 (diff) | |
| download | linux-stable-44a11920ac39fe7fe5191d72c0822ff2a4c3b83d.tar.gz linux-stable-44a11920ac39fe7fe5191d72c0822ff2a4c3b83d.tar.bz2 linux-stable-44a11920ac39fe7fe5191d72c0822ff2a4c3b83d.zip | |
media: atomisp-ov2680: Don't take the input_lock for try_fmt calls.
On ov2680_set_fmt() calls with format->which == V4L2_SUBDEV_FORMAT_TRY,
ov2680_set_fmt() does not talk to the sensor, so there is no need to
lock the dev->input_lock mutex in this case.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c index ab52e35266bb..9ac469878eea 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c @@ -841,8 +841,6 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, if (!ov2680_info) return -EINVAL; - mutex_lock(&dev->input_lock); - res = v4l2_find_nearest_size(ov2680_res_preview, ARRAY_SIZE(ov2680_res_preview), width, height, fmt->width, fmt->height); @@ -855,13 +853,14 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, fmt->code = MEDIA_BUS_FMT_SBGGR10_1X10; if (format->which == V4L2_SUBDEV_FORMAT_TRY) { sd_state->pads->try_fmt = *fmt; - mutex_unlock(&dev->input_lock); return 0; } dev_dbg(&client->dev, "%s: %dx%d\n", __func__, fmt->width, fmt->height); + mutex_lock(&dev->input_lock); + /* s_power has not been called yet for std v4l2 clients (camorama) */ power_up(sd); ret = ov2680_write_reg_array(client, dev->res->regs); |