diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-31 08:44:58 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 10:43:17 -0300 |
commit | 89f3a1422998b35b991c6a059e7acbc99166c5cd (patch) | |
tree | 8bf49564a4c7f884a6fffe32da55a5c32e354796 /drivers/media/pci/saa7134/saa7134.h | |
parent | 813b9dffa0cfefdd71b262e1ec4ad5f7d1fb8f89 (diff) | |
download | linux-89f3a1422998b35b991c6a059e7acbc99166c5cd.tar.gz linux-89f3a1422998b35b991c6a059e7acbc99166c5cd.tar.bz2 linux-89f3a1422998b35b991c6a059e7acbc99166c5cd.zip |
[media] saa7134: move qos_request from saa7134_fh to saa7134_dev
This is a global field, not a per-filehandle field.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 8a62ff733343..8d1453a48014 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -472,7 +472,6 @@ struct saa7134_fh { struct v4l2_fh fh; struct saa7134_dev *dev; unsigned int resources; - struct pm_qos_request qos_request; /* video capture */ struct videobuf_queue cap; @@ -595,6 +594,7 @@ struct saa7134_dev { unsigned int vbi_fieldcount; struct saa7134_format *fmt; unsigned int width, height; + struct pm_qos_request qos_request; /* various v4l controls */ struct saa7134_tvnorm *tvnorm; /* video */ |