diff --git a/[refs] b/[refs]
index 81369618c63d..49b03c05ea48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183d896a03e1f0e4ab69d75f123d33a62b47cf03
+refs/heads/master: d7fbefe06d2061de126095f903359ce1ef61faf3
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index 06b44e1dda1d..e7c01d560b64 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -1360,6 +1360,8 @@ static int __init vivi_init(void)
 	dev->vidq.timeout.data     = (unsigned long)dev;
 	init_timer(&dev->vidq.timeout);
 
+	vivi.current_norm         = tvnorms[0].id;
+
 	ret = video_register_device(&vivi, VFL_TYPE_GRABBER, video_nr);
 	printk(KERN_INFO "Video Technology Magazine Virtual Video Capture Board (Load status: %d)\n", ret);
 	return ret;