From a7888de5af3721610108d8d19393041a8b59eb3d Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Oct 2007 17:27:56 -0300 Subject: [PATCH] --- yaml --- r: 72044 b: refs/heads/master c: 2f7362ef9bc9c41436c7f44212a2dcf12dddffbf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-fileops.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 46f898ded8a4..5699817d7ca4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 254d6eb1159f7398273fe35e7499f905a903f38d +refs/heads/master: 2f7362ef9bc9c41436c7f44212a2dcf12dddffbf diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c index 24fcbb88e529..a200a8a95a2d 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-fileops.c +++ b/trunk/drivers/media/video/ivtv/ivtv-fileops.c @@ -822,6 +822,11 @@ int ivtv_v4l2_close(struct inode *inode, struct file *filp) crystal_freq.flags = 0; ivtv_saa7115(itv, VIDIOC_INT_S_CRYSTAL_FREQ, &crystal_freq); } + if (atomic_read(&itv->capturing) > 0) { + /* Undo video mute */ + ivtv_vapi(itv, CX2341X_ENC_MUTE_VIDEO, 1, + itv->params.video_mute | (itv->params.video_mute_yuv << 8)); + } /* Done! Unmute and continue. */ ivtv_unmute(itv); ivtv_release_stream(s);