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

media: i2c: ov7740: 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 3ca1480a

drivers/media/i2c/ov7740.c

+0 −7
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ struct ov7740 { 
	struct v4l2_ctrl *contrast;



	struct mutex mutex;	/* To serialize asynchronus callbacks */

	bool streaming;		/* Streaming on/off */



	struct gpio_desc *resetb_gpio;

	struct gpio_desc *pwdn_gpio;
@@ -616,10 +615,6 @@ static int ov7740_set_stream(struct v4l2_subdev *sd, int enable) 
	int ret = 0;



	mutex_lock(&ov7740->mutex);

	if (ov7740->streaming == enable) {

		mutex_unlock(&ov7740->mutex);

		return 0;

	}



	if (enable) {

		ret = pm_runtime_resume_and_get(&client->dev);
@@ -633,8 +628,6 @@ static int ov7740_set_stream(struct v4l2_subdev *sd, int enable) 
		pm_runtime_put(&client->dev);

	}



	ov7740->streaming = enable;



	mutex_unlock(&ov7740->mutex);

	return ret;