From c0647329d98327b71f279a69f869a381f4185111 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 12 Oct 2007 06:18:30 -0300
Subject: [PATCH] --- yaml --- r: 72035 b: refs/heads/master c:
 af3420b4495914a1a889ae7de0220c793461ba1f h: refs/heads/master i:   72033:
 69ff98183fcfd7a4389b7c87e15aa9f958a6ddf9   72031:
 297f88f668ec9b5c0504787d8d790b5422d144c5 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 88564f00697e..8d68efc3d1a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a04036a3129e09a9b9097de2b1f77dd82a6e9ac3
+refs/heads/master: af3420b4495914a1a889ae7de0220c793461ba1f
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
index 0e0605cc0bd3..24fcbb88e529 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
@@ -892,6 +892,7 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
 			if (atomic_read(&itv->capturing) > 0) {
 				/* switching to radio while capture is
 				   in progress is not polite */
+				ivtv_release_stream(s);
 				kfree(item);
 				return -EBUSY;
 			}