UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: omap4iss: Remove iss_video streaming field 

The vb2 queue already keeps track of the streaming state, there's no
need to duplicate that in the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2013-11-03 20:28:24 -03:00 committed by Mauro Carvalho Chehab
parent 35c71be8c7
commit f33354f045
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/media/omap4iss/iss_video.c
View File

@ -743,11 +743,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
mutex_lock(&video->stream_lock);
if (video->streaming) {
mutex_unlock(&video->stream_lock);
return -EBUSY;
}
/* Start streaming on the pipeline. No link touching an entity in the
* pipeline can be activated or deactivated once streaming is started.
*/
@ -842,9 +837,6 @@ err_media_entity_pipeline_start:
video->queue = NULL;
}
if (!ret)
video->streaming = 1;
mutex_unlock(&video->stream_lock);
return ret;
}
@ -882,7 +874,6 @@ iss_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
omap4iss_pipeline_set_stream(pipe, ISS_PIPELINE_STREAM_STOPPED);
vb2_streamoff(&vfh->queue, type);
video->queue = NULL;
video->streaming = 0;
if (video->iss->pdata->set_constraints)
video->iss->pdata->set_constraints(video->iss, false);

3
drivers/staging/media/omap4iss/iss_video.h
View File

@ -156,9 +156,6 @@ struct iss_video {
unsigned int bpl_value; /* bytes per line value */
unsigned int bpl_padding; /* padding at end of line */
/* Entity video node streaming */
unsigned int streaming:1;
/* Pipeline state */
struct iss_pipeline pipe;
struct mutex stream_lock; /* pipeline and stream states */