]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: cs5535audio: ensure MIC Bias/Analog Input bail if not on an OLPC machine
authorAndres Salomon <dilinger@queued.net>
Thu, 6 Nov 2008 21:53:34 +0000 (16:53 -0500)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Dec 2008 16:14:48 +0000 (17:14 +0100)
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/cs5535audio/cs5535audio_olpc.c

index 164f6bdab9915628b5ddff4a986339952ea17f31..5c6814335cd727a83e55c58a73ef85965f633841 100644 (file)
@@ -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);