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.h | |
| 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.h')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 1f6c41ed2a07..fc07b19ed536 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -36,6 +36,7 @@ #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-device.h> +#include <media/v4l2-fh.h> #include <media/tuner.h> #include <media/rc-core.h> #include <media/ir-kbd-i2c.h> @@ -468,11 +469,11 @@ struct saa7134_dmaqueue { /* video filehandle status */ struct saa7134_fh { + struct v4l2_fh fh; struct saa7134_dev *dev; unsigned int radio; enum v4l2_buf_type type; unsigned int resources; - enum v4l2_priority prio; struct pm_qos_request qos_request; /* video overlay */ @@ -544,7 +545,6 @@ struct saa7134_dev { struct list_head devlist; struct mutex lock; spinlock_t slock; - struct v4l2_prio_state prio; struct v4l2_device v4l2_dev; /* workstruct for loading modules */ struct work_struct request_module_wk; |