| Message ID | 20230123125205.622152-54-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: atomisp: Big power-management changes + lots of fixes | expand |
On Mon, Jan 23, 2023 at 01:52:01PM +0100, Hans de Goede wrote: > On ov2722_set_fmt() calls with format->which == V4L2_SUBDEV_FORMAT_TRY, > ov2722_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@kernel.org> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c > index 83d036b5d772..e09c80d1f9ec 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c > @@ -651,7 +651,6 @@ static int ov2722_set_fmt(struct v4l2_subdev *sd, > if (!ov2722_info) > return -EINVAL; > > - mutex_lock(&dev->input_lock); > res = v4l2_find_nearest_size(ov2722_res_preview, > ARRAY_SIZE(ov2722_res_preview), width, > height, fmt->width, fmt->height); > @@ -665,10 +664,10 @@ static int ov2722_set_fmt(struct v4l2_subdev *sd, > fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10; > if (format->which == V4L2_SUBDEV_FORMAT_TRY) { > sd_state->pads->try_fmt = *fmt; > - mutex_unlock(&dev->input_lock); > return 0; > } > > + mutex_lock(&dev->input_lock); > > dev->pixels_per_line = dev->res->pixels_per_line; > dev->lines_per_frame = dev->res->lines_per_frame; > -- > 2.39.0 >
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c index 83d036b5d772..e09c80d1f9ec 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c @@ -651,7 +651,6 @@ static int ov2722_set_fmt(struct v4l2_subdev *sd, if (!ov2722_info) return -EINVAL; - mutex_lock(&dev->input_lock); res = v4l2_find_nearest_size(ov2722_res_preview, ARRAY_SIZE(ov2722_res_preview), width, height, fmt->width, fmt->height); @@ -665,10 +664,10 @@ static int ov2722_set_fmt(struct v4l2_subdev *sd, fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10; if (format->which == V4L2_SUBDEV_FORMAT_TRY) { sd_state->pads->try_fmt = *fmt; - mutex_unlock(&dev->input_lock); return 0; } + mutex_lock(&dev->input_lock); dev->pixels_per_line = dev->res->pixels_per_line; dev->lines_per_frame = dev->res->lines_per_frame;
On ov2722_set_fmt() calls with format->which == V4L2_SUBDEV_FORMAT_TRY, ov2722_set_fmt() does not talk to the sensor, so there is no need to lock the dev->input_lock mutex in this case. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)