From 03a8ca5b0459c8e2bdc63e5ec786c0e7449fa6dd Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Thu, 19 Jul 2012 16:45:49 -0300
Subject: [PATCH] --- yaml --- r: 320668 b: refs/heads/master c:
 1a17a942cd0fe430540e9ead2e57eb358b6963bd h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/media/video/vivi.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index da40bc90957c..2f599625eb11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6992c0807517b5736c80983c4881d3f9ae3ab20f
+refs/heads/master: 1a17a942cd0fe430540e9ead2e57eb358b6963bd
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index 1e8c4f3ab602..679e329ffa15 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -1330,9 +1330,6 @@ static int __init vivi_create_instance(int inst)
 	/* Now that everything is fine, let's add it to device list */
 	list_add_tail(&dev->vivi_devlist, &vivi_devlist);
 
-	if (video_nr != -1)
-		video_nr++;
-
 	v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n",
 		  video_device_node_name(vfd));
 	return 0;