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/common | |
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/common')
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 5b34c134aa25..127b0526a727 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -545,11 +545,11 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, | |||
545 | if( VFL_TYPE_GRABBER == type ) { | 545 | if( VFL_TYPE_GRABBER == type ) { |
546 | vv->video_minor = vfd->minor; | 546 | vv->video_minor = vfd->minor; |
547 | INFO(("%s: registered device video%d [v4l2]\n", | 547 | INFO(("%s: registered device video%d [v4l2]\n", |
548 | dev->name, vfd->minor & 0x1f)); | 548 | dev->name, vfd->num)); |
549 | } else { | 549 | } else { |
550 | vv->vbi_minor = vfd->minor; | 550 | vv->vbi_minor = vfd->minor; |
551 | INFO(("%s: registered device vbi%d [v4l2]\n", | 551 | INFO(("%s: registered device vbi%d [v4l2]\n", |
552 | dev->name, vfd->minor & 0x1f)); | 552 | dev->name, vfd->num)); |
553 | } | 553 | } |
554 | 554 | ||
555 | *vid = vfd; | 555 | *vid = vfd; |