github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: i2c: imx219: Move out locking/unlocking of vflip and hflip controls from imx219_set_stream

Browse Source 
[ Upstream commit 745d4612d2 ]

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: 1283b3b8f8 ("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>
This commit is contained in:
Lad Prabhakar 2021-03-11 10:52:04 +01:00 committed by Greg Kroah-Hartman
parent 59dd4fe0ae
commit 0050c97941
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/i2c/imx219.c
View File

@ -1047,8 +1047,16 @@ static int imx219_start_streaming(struct imx219 *imx219)
return ret; return ret;
/* set stream on register */ /* set stream on register */
return imx219_write_reg(imx219, IMX219_REG_MODE_SELECT, ret = imx219_write_reg(imx219, IMX219_REG_MODE_SELECT,
IMX219_REG_VALUE_08BIT, IMX219_MODE_STREAMING); 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) static void imx219_stop_streaming(struct imx219 *imx219)
@ -1061,6 +1069,9 @@ static void imx219_stop_streaming(struct imx219 *imx219)
IMX219_REG_VALUE_08BIT, IMX219_MODE_STANDBY); IMX219_REG_VALUE_08BIT, IMX219_MODE_STANDBY);
if (ret) if (ret)
dev_err(&client->dev, "%s failed to set stream\n", __func__); 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) static int imx219_set_stream(struct v4l2_subdev *sd, int enable)
@ -1096,10 +1107,6 @@ static int imx219_set_stream(struct v4l2_subdev *sd, int enable)
imx219->streaming = 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); mutex_unlock(&imx219->mutex);
return ret; return ret;