Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=018ba85bf6d77eefc67796d707c81e8531b74d2f
Commit:     018ba85bf6d77eefc67796d707c81e8531b74d2f
Parent:     86534e5e8eaeab2f5d2e92cff5e16980750095c6
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Tue Apr 10 18:59:09 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:45:59 2007 -0300

    V4L/DVB (5560): Ivtv: fix incorrect bitwise-and for command flags.
    
    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, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c 
b/drivers/media/video/ivtv/ivtv-ioctl.c
index afb3702..794a6a0 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -289,7 +289,7 @@ static int ivtv_video_command(struct ivtv *itv, struct 
ivtv_open_id *id,
        }
 
        case VIDEO_CMD_STOP:
-               vc->flags &= 
~(VIDEO_CMD_STOP_IMMEDIATELY|VIDEO_CMD_STOP_TO_BLACK);
+               vc->flags &= VIDEO_CMD_STOP_IMMEDIATELY|VIDEO_CMD_STOP_TO_BLACK;
                if (vc->flags & VIDEO_CMD_STOP_IMMEDIATELY)
                        vc->stop.pts = 0;
                if (try) break;
@@ -302,7 +302,7 @@ static int ivtv_video_command(struct ivtv *itv, struct 
ivtv_open_id *id,
                return ivtv_stop_v4l2_decode_stream(s, vc->flags, vc->stop.pts);
 
        case VIDEO_CMD_FREEZE:
-               vc->flags &= ~VIDEO_CMD_FREEZE_TO_BLACK;
+               vc->flags &= VIDEO_CMD_FREEZE_TO_BLACK;
                if (try) break;
                if (itv->output_mode != OUT_MPG)
                        return -EBUSY;
@@ -1095,7 +1095,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, 
unsigned int cmd, void
                        return ivtv_start_capture(id);
 
                case V4L2_ENC_CMD_STOP:
-                       enc->flags &= ~V4L2_ENC_CMD_STOP_AT_GOP_END;
+                       enc->flags &= V4L2_ENC_CMD_STOP_AT_GOP_END;
                        if (try)
                                return 0;
                        ivtv_stop_capture(id, enc->flags & 
V4L2_ENC_CMD_STOP_AT_GOP_END);
-
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