Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=de870b52be9d52c3dad76c9ea7399cb94abcaa1a
Commit:     de870b52be9d52c3dad76c9ea7399cb94abcaa1a
Parent:     37093b1ea600d84fbf7252baf12eedec85ae40f1
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 29 15:22:05 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:05:36 2007 -0300

    V4L/DVB (6048): ivtv: fix stop stream locking
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/ivtv/ivtv-streams.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/ivtv/ivtv-streams.c 
b/drivers/media/video/ivtv/ivtv-streams.c
index d1cc366..4272fbc 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -751,6 +751,9 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int 
gop_end)
                stopmode = 1;
        }
 
+       /* ensure these actions are done only once */
+       mutex_lock(&itv->serialize_lock);
+
        /* end_capture */
        /* when: 0 =  end of GOP  1 = NOW!, type: 0 = mpeg, subtype: 3 = 
video+audio */
        ivtv_vapi(itv, CX2341X_ENC_STOP_CAPTURE, 3, stopmode, cap_type, 
s->subtype);
@@ -803,9 +806,6 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int 
gop_end)
        /* Clear capture and no-read bits */
        clear_bit(IVTV_F_S_STREAMING, &s->s_flags);
 
-       /* ensure these global cleanup actions are done only once */
-       mutex_lock(&itv->serialize_lock);
-
        if (s->type == IVTV_ENC_STREAM_TYPE_VBI)
                ivtv_set_irq_mask(itv, IVTV_IRQ_ENC_VBI_CAP);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to