From 9eb761f7f13b0da713b109fef9e9a1ff538972a3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 5 Apr 2007 17:08:57 +0200 Subject: [PATCH] --- yaml --- r: 56155 b: refs/heads/master c: fdd4bb49ec3f401379875990fcece611c623e32f h: refs/heads/master i: 56153: 5a6caa06df6a432849cb5c247060d2ae06742fca 56151: 615d92455521b7097a0a2de8a748ac9c4a75a1a9 v: v3 --- [refs] | 2 +- trunk/sound/pci/ice1712/juli.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bff1a64f830a..78ddbe341dcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4116ae717d6456884232642bae806125d39f1d3 +refs/heads/master: fdd4bb49ec3f401379875990fcece611c623e32f diff --git a/trunk/sound/pci/ice1712/juli.c b/trunk/sound/pci/ice1712/juli.c index dd0da952ce49..3d8e74e493d7 100644 --- a/trunk/sound/pci/ice1712/juli.c +++ b/trunk/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; } /*