diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2013-02-01 20:01:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 18:59:34 -0300 |
| commit | 3bbaa3a60175ed120c8ab8937c21425fd744c7b7 (patch) | |
| tree | f58fd4912057a4ee8ab79d3674fe56629f9bf2a1 /drivers/media/pci/saa7134/saa7134-core.c | |
| parent | 82456708389d6d9eb81a4479d54efa0bf7dd8bf3 (diff) | |
| download | linux-stable-3bbaa3a60175ed120c8ab8937c21425fd744c7b7.tar.gz linux-stable-3bbaa3a60175ed120c8ab8937c21425fd744c7b7.tar.bz2 linux-stable-3bbaa3a60175ed120c8ab8937c21425fd744c7b7.zip | |
[media] saa7134: v4l2-compliance: use v4l2_fh to fix priority handling
Make saa7134 driver more V4L2 compliant: remove broken priority handling
and use v4l2_fh instead
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
[hans.verkuil@cisco.com: fixed a merge conflict in saa7134.h]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-core.c')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c index 8fd24e7c9403..45f0aca597ae 100644 --- a/drivers/media/pci/saa7134/saa7134-core.c +++ b/drivers/media/pci/saa7134/saa7134-core.c @@ -805,6 +805,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev, vfd->debug = video_debug; snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, type, saa7134_boards[dev->board].name); + set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); video_set_drvdata(vfd, dev); return vfd; } @@ -1028,8 +1029,6 @@ static int saa7134_initdev(struct pci_dev *pci_dev, } } - v4l2_prio_init(&dev->prio); - mutex_lock(&saa7134_devlist_lock); list_for_each_entry(mops, &mops_list, next) mpeg_ops_attach(mops, dev); |