From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 5 Apr 2007 15:08:57 +0000 (+0200)
Subject: [ALSA] ice1724 - call snd_ak4114_build() in juli
X-Git-Tag: v2.6.22-rc1~22^2~60
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd4bb49ec3f401379875990fcece611c623e32f;p=linux-2.6

[ALSA] ice1724 - call snd_ak4114_build() in juli

Call snd_ak4114_build() in juli support code to build proper mixer
elements for SPDIF inputs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
---

diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index dd0da952ce..3d8e74e493 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -138,7 +138,16 @@ static struct snd_akm4xxx akm_juli_dac __devinitdata = {
 
 static int __devinit juli_add_controls(struct snd_ice1712 *ice)
 {
-	return snd_ice1712_akm4xxx_build_controls(ice);
+	int err;
+	err = snd_ice1712_akm4xxx_build_controls(ice);
+	if (err < 0)
+		return err;
+	/* only capture SPDIF over AK4114 */
+	err = snd_ak4114_build(ice->spec.juli.ak4114, NULL,
+			       ice->pcm_pro->streams[SNDRV_PCM_STREAM_CAPTURE].substream);
+	if (err < 0)
+		return err;
+	return 0;
 }
 
 /*