From ea586e451cd97c6378331c13f764c36c6b6cb1f5 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 12 Mar 2011 06:39:44 -0300
Subject: [PATCH] --- yaml --- r: 242130 b: refs/heads/master c:
 6aff72f6d511bcadbc71358ed17bc87edbf90716 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-fileops.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1e558c4506a9..57182dff1da7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e4784d0d3a6167e905a49d0dafa40b022fa1a55
+refs/heads/master: 6aff72f6d511bcadbc71358ed17bc87edbf90716
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
index 4463bf4ec4ee..a7f54b010a5c 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
@@ -980,6 +980,7 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
 		/* Try to claim this stream */
 		if (ivtv_claim_stream(item, item->type)) {
 			/* No, it's already in use */
+			v4l2_fh_exit(&item->fh);
 			kfree(item);
 			return -EBUSY;
 		}