diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-10-22 08:56:24 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-10-22 08:56:24 +0200 |
| commit | 3694393e19784ce8396c6ba5d88aff33f46db319 (patch) | |
| tree | 9138382fe43cfb711764f9cddbef8ed0c89ae129 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | 2e489f8981067cb48570cf1f5e4e64495afa4985 (diff) | |
| parent | 8d0c999d88452b611d2518ad02eae9dbd95e8ce9 (diff) | |
| download | mediapointer-dvb-s2-3694393e19784ce8396c6ba5d88aff33f46db319.tar.gz mediapointer-dvb-s2-3694393e19784ce8396c6ba5d88aff33f46db319.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index c839114a0..1d1fdce21 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1057,7 +1057,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, goto fail4; } printk(KERN_INFO "%s: registered device video%d [v4l2]\n", - dev->name,dev->video_dev->minor & 0x1f); + dev->name, dev->video_dev->num); dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); @@ -1066,7 +1066,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, if (err < 0) goto fail4; printk(KERN_INFO "%s: registered device vbi%d\n", - dev->name,dev->vbi_dev->minor & 0x1f); + dev->name, dev->vbi_dev->num); if (card_has_radio(dev)) { dev->radio_dev = vdev_init(dev,&saa7134_radio_template,"radio"); @@ -1075,7 +1075,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, if (err < 0) goto fail4; printk(KERN_INFO "%s: registered device radio%d\n", - dev->name,dev->radio_dev->minor & 0x1f); + dev->name, dev->radio_dev->num); } /* everything worked */ |