diff options
| author | Andres Salomon <dilinger@queued.net> | 2008-11-06 16:53:34 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-10 17:14:48 +0100 |
| commit | 0fb497f5b6ff8da1e9e60afb39835f40d7f043ec (patch) | |
| tree | aaaf35add585591e477362312f4361a32ad7d12b /sound/pci/cs5535audio | |
| parent | b5ccc57b06b54058879ab3ea548625d9bf88c7fc (diff) | |
| download | kernel_samsung_tuna-0fb497f5b6ff8da1e9e60afb39835f40d7f043ec.zip kernel_samsung_tuna-0fb497f5b6ff8da1e9e60afb39835f40d7f043ec.tar.gz kernel_samsung_tuna-0fb497f5b6ff8da1e9e60afb39835f40d7f043ec.tar.bz2 | |
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/cs5535audio')
| -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 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); |