summaryrefslogtreecommitdiffstats
path: root/sound/pci/cs5535audio/cs5535audio.c
diff options
context:
space:
mode:
authorJaya Kumar <jayakumar.lkml@gmail.com>2008-11-06 22:43:34 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-10 17:14:39 +0100
commit57d4bf6d8e965404b82b105ae44ddf137bb7b8e6 (patch)
treebb617355e385ec52d28d5f4aa858919d0b48c085 /sound/pci/cs5535audio/cs5535audio.c
parentALSA: cs5535audio: suspend/resume callbacks are only defined with CONFIG_PM (diff)
downloadlinux-57d4bf6d8e965404b82b105ae44ddf137bb7b8e6.tar.xz
linux-57d4bf6d8e965404b82b105ae44ddf137bb7b8e6.zip
ALSA: cs5535audio: OLPC analog input support
This is a 2nd cut at adding support for OLPC analog input. Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com> Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'sound/pci/cs5535audio/cs5535audio.c')
-rw-r--r--sound/pci/cs5535audio/cs5535audio.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 6c886edd06db..50333bb9242c 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -171,6 +171,13 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);
+ /* olpc_quirks is dummied out if not olpc */
+ err = olpc_quirks(card, cs5535au->ac97);
+ if (err < 0) {
+ snd_printk(KERN_ERR "olpc quirks failed\n");
+ return err;
+ }
+
return 0;
}