[media] vivi: remove pointless video_nr++
authorHans Verkuil <hverkuil@xs4all.nl>
Thu, 19 Jul 2012 19:45:49 +0000 (16:45 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Jul 2012 23:31:56 +0000 (20:31 -0300)
Remove the pointless video_nr++. It doesn't do anything useful and it has
the unexpected side-effect of changing the video_nr module option, so
cat /sys/module/vivi/parameters/video_nr gives a different value back
then what was specified with modprobe.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/vivi.c

index 1e8c4f3ab60244a89bc4321a30a03c2947e9b50d..679e329ffa1572935d370a557ba5178e0bfbfe07 100644 (file)
@@ -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;