Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ea115d54bc963eb2eb0dc223795f3bd6c689ff99
Commit:     ea115d54bc963eb2eb0dc223795f3bd6c689ff99
Parent:     ad8ff0f10b489562012e433acdac92498fe8bdc9
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 20 16:26:40 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:06:38 2007 -0300

    V4L/DVB (6087): ivtv: prevent changing VBI format while capture is in 
progress
    
    Changing the VBI format requires a CX2341X_ENC_INITIALIZE_INPUT firmware
    call. This can only be done if no capture is in progress. So return
    -EBUSY if the encoder is busy.
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/ivtv/ivtv-ioctl.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c 
b/drivers/media/video/ivtv/ivtv-ioctl.c
index 2bb1e32..0dde82f 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -584,9 +584,7 @@ static int ivtv_try_or_set_fmt(struct ivtv *itv, int 
streamtype,
 
        /* set raw VBI format */
        if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-               if (set_fmt && streamtype == IVTV_ENC_STREAM_TYPE_VBI &&
-                   itv->vbi.sliced_in->service_set &&
-                   atomic_read(&itv->capturing) > 0) {
+               if (set_fmt && atomic_read(&itv->capturing) > 0) {
                        return -EBUSY;
                }
                if (set_fmt) {
@@ -624,7 +622,7 @@ static int ivtv_try_or_set_fmt(struct ivtv *itv, int 
streamtype,
                return 0;
        if (set == 0)
                return -EINVAL;
-       if (atomic_read(&itv->capturing) > 0 && itv->vbi.sliced_in->service_set 
== 0) {
+       if (atomic_read(&itv->capturing) > 0) {
                return -EBUSY;
        }
        itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);
-
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