p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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>
This commit is contained in:
Hans Verkuil 2013-05-31 08:44:58 -03:00 committed by Mauro Carvalho Chehab
parent 813b9dffa0
commit 89f3a14229
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/saa7134/saa7134-video.c
View File

@ -2205,7 +2205,7 @@ static int saa7134_streamon(struct file *file, void *priv,
* Unfortunately, I lack register-level documentation to check the
* Linux FIFO setup and confirm the perfect value.
*/
pm_qos_add_request(&fh->qos_request,
pm_qos_add_request(&dev->qos_request,
PM_QOS_CPU_DMA_LATENCY,
20);
@ -2220,7 +2220,7 @@ static int saa7134_streamoff(struct file *file, void *priv,
struct saa7134_dev *dev = fh->dev;
int res = saa7134_resource(file);
pm_qos_remove_request(&fh->qos_request);
pm_qos_remove_request(&dev->qos_request);
err = videobuf_streamoff(saa7134_queue(file));
if (err < 0)

2
drivers/media/pci/saa7134/saa7134.h
View File

@ -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 */