commit 018ba85bf6d77eefc67796d707c81e8531b74d2f
author Hans Verkuil <hverkuil@xs4all.nl> Tue Apr 10 18:59:09 2007 -0300
committer Mauro Carvalho Chehab <mchehab@infradead.org> Fri Apr 27 15:45:59 2007 -0300
tree 42966e9eaab7560e57fede571cde7470279f3dca
parent 86534e5e8eaeab2f5d2e92cff5e16980750095c6

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>

drivers/media/video/ivtv/ivtv-ioctl.c

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 @@
 	}
 
 	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 @@
 		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 @@
 			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);