Skip to content

Commit

Permalink
V4L/DVB (5560): Ivtv: fix incorrect bitwise-and for command flags.
Browse files Browse the repository at this point in the history 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Apr 27, 2007
1 parent 86534e5 commit 018ba85
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/video/ivtv/ivtv-ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 018ba85

Please sign in to comment.