From f56ee5f9face88f265da0b2b68ed1c8d72724970 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Sun, 22 Jun 2008 17:03:02 -0300
Subject: [PATCH] --- yaml --- r: 98511 b: refs/heads/master c:
 a17898737eaed4ef41f273da7b830c632e06613e h: refs/heads/master i:   98509:
 42e2af66ab3ec05ae91b5049cc5b2c45ade61f52   98507:
 707d29a2ac53bee969549b6d1b202cbcf06f1f82   98503:
 1374266168e750f22dd137c2d4646eb7983ac3dc   98495:
 597b1963912c5f1c6e55da1f1cbea882e7cfdceb v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-empress.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 01872912d682..885e536dc2c2 100644
--- 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
index 1c8cd0ef4a65..3ae71a340822 100644
--- 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;
 }