diff --git a/[refs] b/[refs]
index 562ed2c90065..a7ec23c0b264 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 166983cdfbb2779bec98de89927669ed4c9ff8f2
+refs/heads/master: 406c8b0ff0891ace87440bcb298a91c1927f9ae5
diff --git a/trunk/drivers/media/video/ivtv/ivtv-yuv.c b/trunk/drivers/media/video/ivtv/ivtv-yuv.c
index 15e9bd2486d0..a23108fae4fd 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-yuv.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-yuv.c
@@ -1021,7 +1021,7 @@ void ivtv_yuv_setup_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
 	yi->new_frame_info[frame].update = 0;
 	yi->new_frame_info[frame].interlaced_y = 0;
 	yi->new_frame_info[frame].interlaced_uv = 0;
-	yi->new_frame_info[frame].lace_mode = yi->lace_mode;
+	yi->new_frame_info[frame].lace_mode = yi->lace_mode & IVTV_YUV_MODE_MASK;
 
 	if (memcmp(&yi->old_frame_info_args, &yi->new_frame_info[frame],
 					sizeof(yi->new_frame_info[frame]))) {