media: vivid: Set vid_cap_streaming and vid_out_streaming to true

commit b4add02d2236fd5f568db141cfd8eb4290972eb3 upstream.

When vbi stream is started, followed by video streaming,
the vid_cap_streaming and vid_out_streaming were not being set to true,
which would cause the video stream to stop when vbi stream is stopped.
This patch allows to set vid_cap_streaming and vid_out_streaming to true.
According to Hans Verkuil it appears that these 'if (dev->kthread_vid_cap)'
checks are a left-over from the original vivid development and should never
have been there.

Signed-off-by: Vandana BN <bnvandana@gmail.com>
Cc: <stable@vger.kernel.org>      # for v3.18 and up
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index 4ca3d600aa846f4b099336a2f32c26d2f3edaa91..c66568e8f3882606c5698829efd1d9b132d5058e 100644 (file)
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -239,9 +239,6 @@ static int vid_cap_start_streaming(struct vb2_queue *vq, unsigned count)
        if (vb2_is_streaming(&dev->vb_vid_out_q))
                dev->can_loop_video = vivid_vid_can_loop(dev);
 
-       if (dev->kthread_vid_cap)
-               return 0;
-
        dev->vid_cap_seq_count = 0;
        dprintk(dev, 1, "%s\n", __func__);
        for (i = 0; i < VIDEO_MAX_FRAME; i++)

diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index 0b1b6218ede887601ffe7f5b277ebf2767f30d8a..3e7a26d15074c089421d74605eedd4775a783fb7 100644 (file)
--- a/drivers/media/platform/vivid/vivid-vid-out.c
+++ b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -158,9 +158,6 @@ static int vid_out_start_streaming(struct vb2_queue *vq, unsigned count)
        if (vb2_is_streaming(&dev->vb_vid_cap_q))
                dev->can_loop_video = vivid_vid_can_loop(dev);
 
-       if (dev->kthread_vid_out)
-               return 0;
-
        dev->vid_out_seq_count = 0;
        dprintk(dev, 1, "%s\n", __func__);
        if (dev->start_streaming_error) {