[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20081106165334.7897c989@ephemeral>
Date: Thu, 6 Nov 2008 16:53:34 -0500
From: Andres Salomon <dilinger@...ued.net>
To: "Jaya Kumar" <jayakumar.lkml@...il.com>
Cc: linux-kernel@...r.kernel.org, akpm@...ux-foundation.org,
Takashi Iwai <tiwai@...e.de>
Subject: [PATCH 14/14] ALSA: cs5535audio: ensure MIC Bias/Analog Input bail
if not on an OLPC machine
Signed-off-by: Andres Salomon <dilinger@...ian.org>
---
sound/pci/cs5535audio/cs5535audio_olpc.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index 164f6bd..5c68143 100644
--- a/sound/pci/cs5535audio/cs5535audio_olpc.c
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -26,6 +26,9 @@ void olpc_analog_input(struct snd_ac97 *ac97, int on)
{
int err;
+ if (!machine_is_olpc())
+ return;
+
/* update the High Pass Filter (via AC97_AD_TEST2) */
err = snd_ac97_update_bits(ac97, AC97_AD_TEST2,
1 << AC97_AD_HPFD_SHIFT, on << AC97_AD_HPFD_SHIFT);
@@ -48,6 +51,9 @@ void olpc_mic_bias(struct snd_ac97 *ac97, int on)
{
int err;
+ if (!machine_is_olpc())
+ return;
+
on = on ? 0 : 1;
err = snd_ac97_update_bits(ac97, AC97_AD_MISC,
1 << AC97_AD_VREFD_SHIFT, on << AC97_AD_VREFD_SHIFT);
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists