aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-10-12 05:18:30 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-22 10:01:44 -0400
commitaf3420b4495914a1a889ae7de0220c793461ba1f (patch)
treef8b5a6e8468921a5a2b975d7f01cb36fd78e1998 /drivers/media
parenta04036a3129e09a9b9097de2b1f77dd82a6e9ac3 (diff)
V4L/DVB (6338): ivtv: fix incorrect EBUSY return
Trying to open the radio when a capture is in progress will make it impossible to open the radio again since the radio stream wasn't released. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/ivtv/ivtv-fileops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 0e0605cc0bd3..24fcbb88e529 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -892,6 +892,7 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
892 if (atomic_read(&itv->capturing) > 0) { 892 if (atomic_read(&itv->capturing) > 0) {
893 /* switching to radio while capture is 893 /* switching to radio while capture is
894 in progress is not polite */ 894 in progress is not polite */
895 ivtv_release_stream(s);
895 kfree(item); 896 kfree(item);
896 return -EBUSY; 897 return -EBUSY;
897 } 898 }