diff options
author | Rafael Bilski <rafalbilski@interia.pl> | 2007-06-20 04:37:27 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:14 -0400 |
commit | b784e526a8333db57d1b9f385a12553066bdba64 (patch) | |
tree | 4085d9d4f11dbded4c15d8b15b6b590cf78aa764 /drivers/media/video/saa7134/saa7134-empress.c | |
parent | aac0ca6a8b84541b28af9d18d8b84f90653ce0d0 (diff) |
V4L/DVB (5776): Hardware MPEG audio fix for SAA7134 based "KNC One TV-Station DVR" card
With previous patch card is generating MPEG audio stream too.
Unfortunatly I2S audio output is muted. Unmute it.
Signed-off-by: Rafal Bilski <rafalbilski@interia.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-empress.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index f521603482ca..fc260ec8fdc2 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -96,6 +96,10 @@ static int ts_open(struct inode *inode, struct file *file) | |||
96 | if (dev->empress_users) | 96 | if (dev->empress_users) |
97 | goto done_up; | 97 | goto done_up; |
98 | 98 | ||
99 | /* Unmute audio */ | ||
100 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, | ||
101 | saa_readb(SAA7134_AUDIO_MUTE_CTRL) & ~(1 << 6)); | ||
102 | |||
99 | dev->empress_users++; | 103 | dev->empress_users++; |
100 | file->private_data = dev; | 104 | file->private_data = dev; |
101 | err = 0; | 105 | err = 0; |
@@ -121,6 +125,10 @@ static int ts_release(struct inode *inode, struct file *file) | |||
121 | /* stop the encoder */ | 125 | /* stop the encoder */ |
122 | ts_reset_encoder(dev); | 126 | ts_reset_encoder(dev); |
123 | 127 | ||
128 | /* Mute audio */ | ||
129 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, | ||
130 | saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); | ||
131 | |||
124 | mutex_unlock(&dev->empress_tsq.lock); | 132 | mutex_unlock(&dev->empress_tsq.lock); |
125 | return 0; | 133 | return 0; |
126 | } | 134 | } |