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);