diff options
author | Andres Salomon <dilinger@queued.net> | 2008-11-06 16:53:34 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-10 11:14:48 -0500 |
commit | 0fb497f5b6ff8da1e9e60afb39835f40d7f043ec (patch) | |
tree | aaaf35add585591e477362312f4361a32ad7d12b | |
parent | b5ccc57b06b54058879ab3ea548625d9bf88c7fc (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>
-rw-r--r-- | 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 164f6bdab991..5c6814335cd7 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) | |||
26 | { | 26 | { |
27 | int err; | 27 | int err; |
28 | 28 | ||
29 | if (!machine_is_olpc()) | ||
30 | return; | ||
31 | |||
29 | /* update the High Pass Filter (via AC97_AD_TEST2) */ | 32 | /* update the High Pass Filter (via AC97_AD_TEST2) */ |
30 | err = snd_ac97_update_bits(ac97, AC97_AD_TEST2, | 33 | err = snd_ac97_update_bits(ac97, AC97_AD_TEST2, |
31 | 1 << AC97_AD_HPFD_SHIFT, on << AC97_AD_HPFD_SHIFT); | 34 | 1 << AC97_AD_HPFD_SHIFT, on << AC97_AD_HPFD_SHIFT); |
@@ -48,6 +51,9 @@ void olpc_mic_bias(struct snd_ac97 *ac97, int on) | |||
48 | { | 51 | { |
49 | int err; | 52 | int err; |
50 | 53 | ||
54 | if (!machine_is_olpc()) | ||
55 | return; | ||
56 | |||
51 | on = on ? 0 : 1; | 57 | on = on ? 0 : 1; |
52 | err = snd_ac97_update_bits(ac97, AC97_AD_MISC, | 58 | err = snd_ac97_update_bits(ac97, AC97_AD_MISC, |
53 | 1 << AC97_AD_VREFD_SHIFT, on << AC97_AD_VREFD_SHIFT); | 59 | 1 << AC97_AD_VREFD_SHIFT, on << AC97_AD_VREFD_SHIFT); |