diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-19 23:54:26 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-19 23:54:26 +0200 |
| commit | 5b2bce737fc14b7bb7d6234cf959fc84b4d8a4ef (patch) | |
| tree | ec0478040fffa9df41182c68933a8dbe70f13fda /linux/drivers/media/video/bt8xx | |
| parent | f6e813c74e024cb64e5770555129b7a4549e2899 (diff) | |
| download | mediapointer-dvb-s2-5b2bce737fc14b7bb7d6234cf959fc84b4d8a4ef.tar.gz mediapointer-dvb-s2-5b2bce737fc14b7bb7d6234cf959fc84b4d8a4ef.tar.bz2 | |
v4l: use video_device.num instead of minor in video%d
From: Hans Verkuil <hverkuil@xs4all.nl>
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.
Priority: high
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
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
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index c7bca940a..09188617b 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -4270,7 +4270,7 @@ static int __devinit bttv_register_video(struct bttv *btv) video_nr[btv->c.nr]) < 0) goto err; printk(KERN_INFO "bttv%d: registered device video%d\n", - btv->c.nr,btv->video_dev->minor & 0x1f); + btv->c.nr, btv->video_dev->num); if (device_create_file(&btv->video_dev->dev, &dev_attr_card)<0) { printk(KERN_ERR "bttv%d: device_create_file 'card' " @@ -4287,7 +4287,7 @@ static int __devinit bttv_register_video(struct bttv *btv) vbi_nr[btv->c.nr]) < 0) goto err; printk(KERN_INFO "bttv%d: registered device vbi%d\n", - btv->c.nr,btv->vbi_dev->minor & 0x1f); + btv->c.nr, btv->vbi_dev->num); if (!btv->has_radio) return 0; @@ -4299,7 +4299,7 @@ static int __devinit bttv_register_video(struct bttv *btv) radio_nr[btv->c.nr]) < 0) goto err; printk(KERN_INFO "bttv%d: registered device radio%d\n", - btv->c.nr,btv->radio_dev->minor & 0x1f); + btv->c.nr, btv->radio_dev->num); /* all done */ return 0; |