---

yaml --- r: 97756 b: refs/heads/master c: 388748e h: refs/heads/master v: v3
git-mirror · Jun 5, 2008 · 8c5e13f · 8c5e13f
1 parent 36c4ef2
commit 8c5e13f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6637dea60ec93916ea0623a0e9bcc2b1769cbc11
+refs/heads/master: 388748e61cc59487c34e1dfa890ffc44e4d16b1f
diff --git a/trunk/drivers/media/video/saa7134/saa7134-empress.c b/trunk/drivers/media/video/saa7134/saa7134-empress.c
@@ -163,8 +163,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,