From 56eb8c85473f48c34f74e3591b956e3c63957262 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 5 Feb 2008 10:29:31 -0200 Subject: backport kernel commit 9004acc70e8c49c50c4c7b652f906f1e0ed5709d From: Mauro Carvalho Chehab Original patch comments: Author: Takashi Iwai Date: Tue Jan 8 18:13:27 2008 +0100 [ALSA] Remove sound/driver.h This header file exists only for some hacks to adapt alsa-driver tree. It's useless for building in the kernel. Let's move a few lines in it to sound/core.h and remove it. With this patch, sound/driver.h isn't removed but has just a single compile warning to include it. This should be really killed in future. Signed-off-by: Mauro Carvalho Chehab --- linux/sound/i2c/other/tea575x-tuner.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/sound/i2c') diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c index 52d190597..4c100300c 100644 --- a/linux/sound/i2c/other/tea575x-tuner.c +++ b/linux/sound/i2c/other/tea575x-tuner.c @@ -20,7 +20,6 @@ * */ -#include #include #include #include -- cgit v1.2.3 From debafa4c14110eb6c01ab9756953c5f9cd351f05 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 5 Feb 2008 09:57:44 -0200 Subject: backport kernel commit 69252128ec628e9d19739db0101e1826d993aecb From: Mauro Carvalho Chehab Original Changelog: Author: Andy Shevchenko 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 --- linux/sound/i2c/other/tea575x-tuner.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'linux/sound/i2c') 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) -- cgit v1.2.3 From 4ac1cd8ad088bf6e13b4448feb8806a56c361a17 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 5 Feb 2008 11:21:32 -0200 Subject: Fix compilation against kernel 2.6.23 From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/sound/i2c/other/tea575x-tuner.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux/sound/i2c') diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c index 6d1dc0f9f..a7fbe18d0 100644 --- a/linux/sound/i2c/other/tea575x-tuner.c +++ b/linux/sound/i2c/other/tea575x-tuner.c @@ -24,6 +24,7 @@ #include #include #include +#include "compat.h" #include #include -- cgit v1.2.3