| Message ID | 20210311095205.8095-2-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 745d4612d2c853c00abadbf69799c8aee7f99c39 |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: i2c: imx219: Trivial Fixes | expand |
Hi Prabhakar, Thank you for the patch. On Thu, Mar 11, 2021 at 09:52:04AM +0000, Lad Prabhakar wrote: > Move out locking/unlocking of vflip and hflip controls from > imx219_set_stream() to the imx219_start_streaming()/ > imx219_stop_streaming() respectively. > > This fixes an issue in resume callback error path where streaming is > stopped and the controls are left in locked state. > > Fixes: 1283b3b8f82b9 ("media: i2c: Add driver for Sony IMX219 sensor") > Reported-by: Pavel Machek <pavel@denx.de> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/i2c/imx219.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c > index 6e3382b85a90..82756cbfbaac 100644 > --- a/drivers/media/i2c/imx219.c > +++ b/drivers/media/i2c/imx219.c > @@ -1056,8 +1056,16 @@ static int imx219_start_streaming(struct imx219 *imx219) > return ret; > > /* set stream on register */ > - return imx219_write_reg(imx219, IMX219_REG_MODE_SELECT, > - IMX219_REG_VALUE_08BIT, IMX219_MODE_STREAMING); > + ret = imx219_write_reg(imx219, IMX219_REG_MODE_SELECT, > + IMX219_REG_VALUE_08BIT, IMX219_MODE_STREAMING); > + if (ret) > + return ret; > + > + /* vflip and hflip cannot change during streaming */ > + __v4l2_ctrl_grab(imx219->vflip, true); > + __v4l2_ctrl_grab(imx219->hflip, true); > + > + return 0; > } > > static void imx219_stop_streaming(struct imx219 *imx219) > @@ -1070,6 +1078,9 @@ static void imx219_stop_streaming(struct imx219 *imx219) > IMX219_REG_VALUE_08BIT, IMX219_MODE_STANDBY); > if (ret) > dev_err(&client->dev, "%s failed to set stream\n", __func__); > + > + __v4l2_ctrl_grab(imx219->vflip, false); > + __v4l2_ctrl_grab(imx219->hflip, false); > } > > static int imx219_set_stream(struct v4l2_subdev *sd, int enable) > @@ -1105,10 +1116,6 @@ static int imx219_set_stream(struct v4l2_subdev *sd, int enable) > > imx219->streaming = enable; > > - /* vflip and hflip cannot change during streaming */ > - __v4l2_ctrl_grab(imx219->vflip, enable); > - __v4l2_ctrl_grab(imx219->hflip, enable); > - > mutex_unlock(&imx219->mutex); > > return ret;
diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 6e3382b85a90..82756cbfbaac 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1056,8 +1056,16 @@ static int imx219_start_streaming(struct imx219 *imx219) return ret; /* set stream on register */ - return imx219_write_reg(imx219, IMX219_REG_MODE_SELECT, - IMX219_REG_VALUE_08BIT, IMX219_MODE_STREAMING); + ret = imx219_write_reg(imx219, IMX219_REG_MODE_SELECT, + IMX219_REG_VALUE_08BIT, IMX219_MODE_STREAMING); + if (ret) + return ret; + + /* vflip and hflip cannot change during streaming */ + __v4l2_ctrl_grab(imx219->vflip, true); + __v4l2_ctrl_grab(imx219->hflip, true); + + return 0; } static void imx219_stop_streaming(struct imx219 *imx219) @@ -1070,6 +1078,9 @@ static void imx219_stop_streaming(struct imx219 *imx219) IMX219_REG_VALUE_08BIT, IMX219_MODE_STANDBY); if (ret) dev_err(&client->dev, "%s failed to set stream\n", __func__); + + __v4l2_ctrl_grab(imx219->vflip, false); + __v4l2_ctrl_grab(imx219->hflip, false); } static int imx219_set_stream(struct v4l2_subdev *sd, int enable) @@ -1105,10 +1116,6 @@ static int imx219_set_stream(struct v4l2_subdev *sd, int enable) imx219->streaming = enable; - /* vflip and hflip cannot change during streaming */ - __v4l2_ctrl_grab(imx219->vflip, enable); - __v4l2_ctrl_grab(imx219->hflip, enable); - mutex_unlock(&imx219->mutex); return ret;
Move out locking/unlocking of vflip and hflip controls from imx219_set_stream() to the imx219_start_streaming()/ imx219_stop_streaming() respectively. This fixes an issue in resume callback error path where streaming is stopped and the controls are left in locked state. Fixes: 1283b3b8f82b9 ("media: i2c: Add driver for Sony IMX219 sensor") Reported-by: Pavel Machek <pavel@denx.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- drivers/media/i2c/imx219.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)