mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 20:46:48 +02:00
media: i2c: imx334: 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
1cbdd6659b
commit
5a6e2fc7d0
|
|
@ -138,7 +138,6 @@ struct imx334_mode {
|
|||
* @mutex: Mutex for serializing sensor controls
|
||||
* @menu_skip_mask: Menu skip mask for link_freq_ctrl
|
||||
* @cur_code: current selected format code
|
||||
* @streaming: Flag indicating streaming state
|
||||
*/
|
||||
struct imx334 {
|
||||
struct device *dev;
|
||||
|
|
@ -161,7 +160,6 @@ struct imx334 {
|
|||
struct mutex mutex;
|
||||
unsigned long menu_skip_mask;
|
||||
u32 cur_code;
|
||||
bool streaming;
|
||||
};
|
||||
|
||||
static const s64 link_freq[] = {
|
||||
|
|
@ -1051,11 +1049,6 @@ static int imx334_set_stream(struct v4l2_subdev *sd, int enable)
|
|||
|
||||
mutex_lock(&imx334->mutex);
|
||||
|
||||
if (imx334->streaming == enable) {
|
||||
mutex_unlock(&imx334->mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (enable) {
|
||||
ret = pm_runtime_resume_and_get(imx334->dev);
|
||||
if (ret < 0)
|
||||
|
|
@ -1069,8 +1062,6 @@ static int imx334_set_stream(struct v4l2_subdev *sd, int enable)
|
|||
pm_runtime_put(imx334->dev);
|
||||
}
|
||||
|
||||
imx334->streaming = enable;
|
||||
|
||||
mutex_unlock(&imx334->mutex);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user