]> err.no Git - linux-2.6/commitdiff
[ALSA] ice1724 - call snd_ak4114_build() in juli
authorTakashi Iwai <tiwai@suse.de>
Thu, 5 Apr 2007 15:08:57 +0000 (17:08 +0200)
committerJaroslav Kysela <perex@suse.cz>
Fri, 11 May 2007 14:55:57 +0000 (16:55 +0200)
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>
sound/pci/ice1712/juli.c

index dd0da952ce4901cded0eec8f5428118930260968..3d8e74e493d797a65f27cd3c174ab1c5d0ae2935 100644 (file)
@@ -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;
 }
 
 /*