diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-19 17:54:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 12:31:37 -0400 |
commit | c6330fb86fd0fed98b7e0d5792881a77b778fefc (patch) | |
tree | 3c87d6fa7053963cfdea592a2956b28354ce0832 /drivers/media/video/stk-webcam.c | |
parent | 323a491a29d0bb1e91263ca347cb42c4de28adfc (diff) |
V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d
The kernel number of a v4l2 node (e.g. videoX, radioX or vbiX) is now
independent of the minor number. So instead of using the minor field
of the video_device struct one has to use the num field: this always
contains the kernel number of the device node.
I forgot about this when I did the v4l2 core change, so this patch
converts all drivers that use it in one go. Luckily the change is
trivial.
Cc: michael@mihu.de
Cc: mchehab@infradead.org
Cc: corbet@lwn.net
Cc: luca.risolia@studio.unibo.it
Cc: isely@pobox.com
Cc: pe1rxq@amsat.org
Cc: royale@zerezo.com
Cc: mkrufky@linuxtv.org
Cc: stoth@linuxtv.org
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
-rw-r--r-- | drivers/media/video/stk-webcam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index edaea4964513..e9eb6d754d5c 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -1331,7 +1331,7 @@ static int stk_register_video_device(struct stk_camera *dev) | |||
1331 | STK_ERROR("v4l registration failed\n"); | 1331 | STK_ERROR("v4l registration failed\n"); |
1332 | else | 1332 | else |
1333 | STK_INFO("Syntek USB2.0 Camera is now controlling video device" | 1333 | STK_INFO("Syntek USB2.0 Camera is now controlling video device" |
1334 | " /dev/video%d\n", dev->vdev.minor); | 1334 | " /dev/video%d\n", dev->vdev.num); |
1335 | return err; | 1335 | return err; |
1336 | } | 1336 | } |
1337 | 1337 | ||
@@ -1426,7 +1426,7 @@ static void stk_camera_disconnect(struct usb_interface *interface) | |||
1426 | stk_remove_sysfs_files(&dev->vdev); | 1426 | stk_remove_sysfs_files(&dev->vdev); |
1427 | 1427 | ||
1428 | STK_INFO("Syntek USB2.0 Camera release resources " | 1428 | STK_INFO("Syntek USB2.0 Camera release resources " |
1429 | "video device /dev/video%d\n", dev->vdev.minor); | 1429 | "video device /dev/video%d\n", dev->vdev.num); |
1430 | 1430 | ||
1431 | video_unregister_device(&dev->vdev); | 1431 | video_unregister_device(&dev->vdev); |
1432 | } | 1432 | } |