| From 648e0263e365855ecab1318315372d913b9bad31 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 11 Mar 2021 10:52:04 +0100 |
| Subject: media: i2c: imx219: Move out locking/unlocking of vflip and hflip |
| controls from imx219_set_stream |
| |
| From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> |
| |
| [ Upstream commit 745d4612d2c853c00abadbf69799c8aee7f99c39 ] |
| |
| 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> |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 e7791a0848b3..98f0a13a7382 100644 |
| --- a/drivers/media/i2c/imx219.c |
| +++ b/drivers/media/i2c/imx219.c |
| @@ -1045,8 +1045,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) |
| @@ -1059,6 +1067,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) |
| @@ -1094,10 +1105,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; |
| -- |
| 2.30.2 |
| |