diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-04-10 17:59:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 14:45:59 -0400 |
commit | 018ba85bf6d77eefc67796d707c81e8531b74d2f (patch) | |
tree | 42966e9eaab7560e57fede571cde7470279f3dca /drivers/media/video/ivtv/ivtv-ioctl.c | |
parent | 86534e5e8eaeab2f5d2e92cff5e16980750095c6 (diff) |
V4L/DVB (5560): Ivtv: fix incorrect bitwise-and for command flags.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-ioctl.c')
-rw-r--r-- | 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 afb3702ed404..794a6a02f82f 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, | |||
289 | } | 289 | } |
290 | 290 | ||
291 | case VIDEO_CMD_STOP: | 291 | case VIDEO_CMD_STOP: |
292 | vc->flags &= ~(VIDEO_CMD_STOP_IMMEDIATELY|VIDEO_CMD_STOP_TO_BLACK); | 292 | vc->flags &= VIDEO_CMD_STOP_IMMEDIATELY|VIDEO_CMD_STOP_TO_BLACK; |
293 | if (vc->flags & VIDEO_CMD_STOP_IMMEDIATELY) | 293 | if (vc->flags & VIDEO_CMD_STOP_IMMEDIATELY) |
294 | vc->stop.pts = 0; | 294 | vc->stop.pts = 0; |
295 | if (try) break; | 295 | if (try) break; |
@@ -302,7 +302,7 @@ static int ivtv_video_command(struct ivtv *itv, struct ivtv_open_id *id, | |||
302 | return ivtv_stop_v4l2_decode_stream(s, vc->flags, vc->stop.pts); | 302 | return ivtv_stop_v4l2_decode_stream(s, vc->flags, vc->stop.pts); |
303 | 303 | ||
304 | case VIDEO_CMD_FREEZE: | 304 | case VIDEO_CMD_FREEZE: |
305 | vc->flags &= ~VIDEO_CMD_FREEZE_TO_BLACK; | 305 | vc->flags &= VIDEO_CMD_FREEZE_TO_BLACK; |
306 | if (try) break; | 306 | if (try) break; |
307 | if (itv->output_mode != OUT_MPG) | 307 | if (itv->output_mode != OUT_MPG) |
308 | return -EBUSY; | 308 | return -EBUSY; |
@@ -1095,7 +1095,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void | |||
1095 | return ivtv_start_capture(id); | 1095 | return ivtv_start_capture(id); |
1096 | 1096 | ||
1097 | case V4L2_ENC_CMD_STOP: | 1097 | case V4L2_ENC_CMD_STOP: |
1098 | enc->flags &= ~V4L2_ENC_CMD_STOP_AT_GOP_END; | 1098 | enc->flags &= V4L2_ENC_CMD_STOP_AT_GOP_END; |
1099 | if (try) | 1099 | if (try) |
1100 | return 0; | 1100 | return 0; |
1101 | ivtv_stop_capture(id, enc->flags & V4L2_ENC_CMD_STOP_AT_GOP_END); | 1101 | ivtv_stop_capture(id, enc->flags & V4L2_ENC_CMD_STOP_AT_GOP_END); |