aboutsummaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2008-11-06 16:53:34 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-10 17:14:48 +0100
commit0fb497f5b6ff8da1e9e60afb39835f40d7f043ec (patch)
treeaaaf35add585591e477362312f4361a32ad7d12b /sound/pci
parentb5ccc57b06b54058879ab3ea548625d9bf88c7fc (diff)
ALSA: cs5535audio: ensure MIC Bias/Analog Input bail if not on an OLPC machine
Signed-off-by: Andres Salomon <dilinger@debian.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/cs5535audio/cs5535audio_olpc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index 164f6bdab99..5c6814335cd 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);