From 9f5f35559adba449c029b6e6aaefae6cec85eebc Mon Sep 17 00:00:00 2001 From: Rafael Bilski Date: Wed, 20 Jun 2007 05:37:27 -0300 Subject: [PATCH] --- yaml --- r: 61333 b: refs/heads/master c: b784e526a8333db57d1b9f385a12553066bdba64 h: refs/heads/master i: 61331: e74fa09f754b1e262942190f5f8dd8c18dbebc41 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-empress.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 73f8d4fd27e9..2fc90f205b6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aac0ca6a8b84541b28af9d18d8b84f90653ce0d0 +refs/heads/master: b784e526a8333db57d1b9f385a12553066bdba64 diff --git a/trunk/drivers/media/video/saa7134/saa7134-empress.c b/trunk/drivers/media/video/saa7134/saa7134-empress.c index f521603482ca..fc260ec8fdc2 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-empress.c +++ b/trunk/drivers/media/video/saa7134/saa7134-empress.c @@ -96,6 +96,10 @@ static int ts_open(struct inode *inode, struct file *file) if (dev->empress_users) goto done_up; + /* Unmute audio */ + saa_writeb(SAA7134_AUDIO_MUTE_CTRL, + saa_readb(SAA7134_AUDIO_MUTE_CTRL) & ~(1 << 6)); + dev->empress_users++; file->private_data = dev; err = 0; @@ -121,6 +125,10 @@ static int ts_release(struct inode *inode, struct file *file) /* stop the encoder */ ts_reset_encoder(dev); + /* Mute audio */ + saa_writeb(SAA7134_AUDIO_MUTE_CTRL, + saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); + mutex_unlock(&dev->empress_tsq.lock); return 0; }