Commit 3ca1480a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Hans Verkuil
Browse files

media: i2c: ov5695: 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>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 1b59508e

drivers/media/i2c/ov5695.c

+0 −6
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ struct ov5695 { 
	struct v4l2_ctrl	*vblank;

	struct v4l2_ctrl	*test_pattern;

	struct mutex		mutex;

	bool			streaming;

	const struct ov5695_mode *cur_mode;

};
@@ -935,9 +934,6 @@ static int ov5695_s_stream(struct v4l2_subdev *sd, int on) 
	int ret = 0;



	mutex_lock(&ov5695->mutex);

	on = !!on;

	if (on == ov5695->streaming)

		goto unlock_and_return;



	if (on) {

		ret = pm_runtime_resume_and_get(&client->dev);
@@ -955,8 +951,6 @@ static int ov5695_s_stream(struct v4l2_subdev *sd, int on) 
		pm_runtime_put(&client->dev);

	}



	ov5695->streaming = on;



unlock_and_return:

	mutex_unlock(&ov5695->mutex);