---

yaml --- r: 98511 b: refs/heads/master c: a178987 h: refs/heads/master i: 98509: 42e2af6 98507: 707d29a 98503: 1374266 98495: 597b196 v: v3
git-mirror · Jun 26, 2008 · f56ee5f · f56ee5f
1 parent fa75ecc
commit f56ee5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c554e6b984ce6b36488b93a7ec8e2752233e7cb
+refs/heads/master: a17898737eaed4ef41f273da7b830c632e06613e
diff --git a/trunk/drivers/media/video/saa7134/saa7134-empress.c b/trunk/drivers/media/video/saa7134/saa7134-empress.c
@@ -110,6 +110,8 @@ static int ts_release(struct inode *inode, struct file *file)
 {
 	struct saa7134_dev *dev = file->private_data;
 
+	mutex_lock(&dev->empress_tsq.vb_lock);
+
 	videobuf_stop(&dev->empress_tsq);
 	videobuf_mmap_free(&dev->empress_tsq);
 
@@ -122,6 +124,8 @@ static int ts_release(struct inode *inode, struct file *file)
 
 	dev->empress_users--;
 
+	mutex_unlock(&dev->empress_tsq.vb_lock);
+
 	return 0;
 }