Commit e8d6eb9a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Hans Verkuil

media: i2c: ov4689: Drop check for reentrant .s_stream()

The subdev .s_stream() operation shall not be called to start streaming
on an already started subdev, or stop streaming on a stopped subdev.
Remove the check that guards against that condition.

The streaming field of the driver's private structure is now unused,
drop it as well.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarMikhail Rudenko <mike.rudenko@gmail.com>
[Sakari Ailus: remove now-redundant "streaming" from comment.]
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 58e7ab2f
......@@ -99,8 +99,7 @@ struct ov4689 {
u32 clock_rate;
struct mutex mutex; /* lock to protect streaming, ctrls and cur_mode */
bool streaming;
struct mutex mutex; /* lock to protect ctrls and cur_mode */
struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_ctrl *exposure;
......@@ -468,10 +467,6 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on)
mutex_lock(&ov4689->mutex);
on = !!on;
if (on == ov4689->streaming)
goto unlock_and_return;
if (on) {
ret = pm_runtime_resume_and_get(&client->dev);
if (ret < 0)
......@@ -504,8 +499,6 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on)
pm_runtime_put(&client->dev);
}
ov4689->streaming = on;
unlock_and_return:
mutex_unlock(&ov4689->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment