summaryrefslogtreecommitdiff
path: root/linux/sound
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 09:57:44 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 09:57:44 -0200
commitdebafa4c14110eb6c01ab9756953c5f9cd351f05 (patch)
treec646cff1179901f11c5b754411655bcaa981c8e8 /linux/sound
parentc39fbb761698258a2a8e707db7373f41f5a54051 (diff)
downloadmediapointer-dvb-s2-debafa4c14110eb6c01ab9756953c5f9cd351f05.tar.gz
mediapointer-dvb-s2-debafa4c14110eb6c01ab9756953c5f9cd351f05.tar.bz2
backport kernel commit 69252128ec628e9d19739db0101e1826d993aecb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original Changelog: Author: Andy Shevchenko <andy@smile.org.ua> Date: Thu Jan 24 18:11:53 2008 +0100 [ALSA] fm801 - Add mute support for FM-only card with FM801 PCI to tuner bridge This is improvement of the early support of the FM-only cards where the fm801 chip represents the PCI to tuner bridge. The tuner initialization isn't included the mute on as well as mute support via V4L request. Proposed patch should fix this at least for 64-PCR model. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound')
-rw-r--r--linux/sound/i2c/other/tea575x-tuner.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c
index 4c100300c..6d1dc0f9f 100644
--- a/linux/sound/i2c/other/tea575x-tuner.c
+++ b/linux/sound/i2c/other/tea575x-tuner.c
@@ -166,6 +166,10 @@ static int snd_tea575x_ioctl(struct inode *inode, struct file *file,
struct video_audio v;
if(copy_from_user(&v, arg, sizeof(v)))
return -EFAULT;
+ if (tea->ops->mute)
+ tea->ops->mute(tea,
+ (v.flags &
+ VIDEO_AUDIO_MUTE) ? 1 : 0);
if(v.audio)
return -EINVAL;
return 0;
@@ -217,6 +221,10 @@ void snd_tea575x_init(struct snd_tea575x *tea)
tea->freq = 90500 * 16; /* 90.5Mhz default */
snd_tea575x_set_freq(tea);
+
+ /* mute on init */
+ if (tea->ops->mute)
+ tea->ops->mute(tea, 1);
}
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)