diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 18:14:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 18:14:57 -0300 |
| commit | 6d2a77ee876428f13d4e34ecc252fa6ca4f3997a (patch) | |
| tree | d785775d46700b6aace81d867bdd963bd5a528ef /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 00ac7fc0004f2e088ae6fa1657735105e50968b5 (diff) | |
| parent | 44643ca470044ddd9b01cf78c51ec22b1e0494a7 (diff) | |
| download | mediapointer-dvb-s2-6d2a77ee876428f13d4e34ecc252fa6ca4f3997a.tar.gz mediapointer-dvb-s2-6d2a77ee876428f13d4e34ecc252fa6ca4f3997a.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
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, |