diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-04-05 17:08:57 +0200 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:57 +0200 |
commit | fdd4bb49ec3f401379875990fcece611c623e32f (patch) | |
tree | e435de7cd5e985ec8a1f78e516c95275315a269b /sound/pci/ice1712/juli.c | |
parent | c4116ae717d6456884232642bae806125d39f1d3 (diff) | |
download | op-kernel-dev-fdd4bb49ec3f401379875990fcece611c623e32f.zip op-kernel-dev-fdd4bb49ec3f401379875990fcece611c623e32f.tar.gz |
[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>
Diffstat (limited to 'sound/pci/ice1712/juli.c')
-rw-r--r-- | sound/pci/ice1712/juli.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index dd0da95..3d8e74e 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; } /* |