summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2012-07-19 16:45:49 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 20:31:56 -0300
commit1a17a942cd0fe430540e9ead2e57eb358b6963bd (patch)
treed424506d84809323749f191c169c1be8aba8dfdd /drivers/media
parent6992c0807517b5736c80983c4881d3f9ae3ab20f (diff)
downloadlinux-stable-1a17a942cd0fe430540e9ead2e57eb358b6963bd.tar.gz
linux-stable-1a17a942cd0fe430540e9ead2e57eb358b6963bd.tar.bz2
linux-stable-1a17a942cd0fe430540e9ead2e57eb358b6963bd.zip
[media] vivi: remove pointless video_nr++
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/vivi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 1e8c4f3ab602..679e329ffa15 100644
--- a/drivers/media/video/vivi.c
+++ b/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;