diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 18:13:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 18:13:23 -0300 |
| commit | 44643ca470044ddd9b01cf78c51ec22b1e0494a7 (patch) | |
| tree | 7c5ca3584a3f2bc65cb1cea81a4ff463159b62c8 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 7288f7ce4c594f7332bd451b8a97888b695b5ce6 (diff) | |
| parent | 480df628e9153e3669da57b2a41eacc00666066c (diff) | |
| download | mediapointer-dvb-s2-44643ca470044ddd9b01cf78c51ec22b1e0494a7.tar.gz mediapointer-dvb-s2-44643ca470044ddd9b01cf78c51ec22b1e0494a7.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda18271
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index ba32fd8f6..b8ecaa623 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -172,8 +172,7 @@ ts_mmap(struct file *file, struct vm_area_struct * vma) static int empress_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { - struct saa7134_fh *fh = priv; - struct saa7134_dev *dev = fh->dev; + struct saa7134_dev *dev = file->private_data; strcpy(cap->driver, "saa7134"); strlcpy(cap->card, saa7134_boards[dev->board].name, |