diff --git a/[refs] b/[refs]
index 62e6e7801372..562ed2c90065 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3e5f5e2dfb50bebca24329e5377d804c6e3eb1b
+refs/heads/master: 166983cdfbb2779bec98de89927669ed4c9ff8f2
diff --git a/trunk/drivers/media/video/ivtv/ivtv-irq.c b/trunk/drivers/media/video/ivtv/ivtv-irq.c
index fc8eac09584c..8c00d8f6d4d9 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-irq.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-irq.c
@@ -797,7 +797,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)
 		/* Check if we need to update the yuv registers */
 		if ((yi->yuv_forced_update || yi->new_frame_info[last_dma_frame].update) && last_dma_frame != -1) {
 			if (!yi->new_frame_info[last_dma_frame].update)
-				last_dma_frame = (last_dma_frame - 1) & 3;
+				last_dma_frame = (u8)(last_dma_frame - 1) % IVTV_YUV_BUFFERS;
 
 			if (yi->new_frame_info[last_dma_frame].src_w) {
 				yi->update_frame = last_dma_frame;