media: i2c: ov2685: 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
acc53ef65c
commit
493d786bd8
@ -91,7 +91,6 @@ struct ov2685 {
|
||||
struct gpio_desc *reset_gpio;
|
||||
struct regulator_bulk_data supplies[OV2685_NUM_SUPPLIES];
|
||||
|
||||
bool streaming;
|
||||
struct mutex mutex;
|
||||
struct v4l2_subdev subdev;
|
||||
struct media_pad pad;
|
||||
@ -513,10 +512,6 @@ static int ov2685_s_stream(struct v4l2_subdev *sd, int on)
|
||||
|
||||
mutex_lock(&ov2685->mutex);
|
||||
|
||||
on = !!on;
|
||||
if (on == ov2685->streaming)
|
||||
goto unlock_and_return;
|
||||
|
||||
if (on) {
|
||||
ret = pm_runtime_resume_and_get(&ov2685->client->dev);
|
||||
if (ret < 0)
|
||||
@ -539,8 +534,6 @@ static int ov2685_s_stream(struct v4l2_subdev *sd, int on)
|
||||
pm_runtime_put(&ov2685->client->dev);
|
||||
}
|
||||
|
||||
ov2685->streaming = on;
|
||||
|
||||
unlock_and_return:
|
||||
mutex_unlock(&ov2685->mutex);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user