From: Hans Verkuil Date: Sun, 14 Oct 2007 20:27:56 +0000 (-0300) Subject: V4L/DVB (6348): ivtv: undo video mute when closing the radio X-Git-Tag: v2.6.24-rc1~66^2~10 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2f7362ef9bc9c41436c7f44212a2dcf12dddffbf;p=linux-2.6-omap-h63xx.git V4L/DVB (6348): ivtv: undo video mute when closing the radio Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index 24fcbb88e52..a200a8a95a2 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/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);