summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-10-14 22:27:56 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2007-10-14 22:27:56 +0200
commitdb8644ddeb12f8c9a0ce76b809db98511301ed6e (patch)
treed481bde59f9cedfc6b92a4c108f11b87cdb0fc41 /linux/drivers/media/video/ivtv
parentff5c0ceac1558d43cba6c8b4ff5f00b985445982 (diff)
downloadmediapointer-dvb-s2-db8644ddeb12f8c9a0ce76b809db98511301ed6e.tar.gz
mediapointer-dvb-s2-db8644ddeb12f8c9a0ce76b809db98511301ed6e.tar.bz2
ivtv: undo video mute when closing the radio.
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-fileops.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c
index bb697dc9e..8713c61b3 100644
--- a/linux/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/linux/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);