diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-11-03 20:28:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-12-03 17:48:40 -0200 |
| commit | f33354f0451dc6bf339052f28078a5e139fcf38c (patch) | |
| tree | 87c8756fada28041c18487eedd783c2991de4e99 | |
| parent | 35c71be8c75dbf80d30f37347a5b2be19761f83e (diff) | |
[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>
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_video.c | 9 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_video.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index bab62d762add..1cdfc4339498 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -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); diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h index 8cf1b3500e44..35f14d84330b 100644 --- a/drivers/staging/media/omap4iss/iss_video.h +++ b/drivers/staging/media/omap4iss/iss_video.h @@ -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 */ |