linux-next: build failure after merge of the sound-asoc tree

linux-next: build failure after merge of the sound-asoc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/soc-core.c: In function 'soc_probe_aux_dev':
sound/soc/soc-core.c:1647: error: 'struct snd_soc_dapm_context' has no member named 'list'
sound/soc/soc-core.c:1647: error: 'struct snd_soc_card' has no member named 'dapm_list'

Caused by commit 2eea392d0a28a0a07d36a9da544eb40f81bf4cb6 ("ASoC: Add
support for optional auxiliary dailess codecs").

I have used the version of the sound-asoc tree from next-20101130 for today
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

[PATCH] ASoC: Fix build failure in soc-core.c

[Jarkko Nikula]

Commit 2eea392 "ASoC: Add support for optional auxiliary dailess codecs"
causes a build failure in soc-core.c: soc_probe_aux_dev since code tries to
access non-existing struct snd_soc_dapm_context and struct snd_soc_card
members.

Root cause for this was a double accident. Author sent the RFC patch from
top of another patch set and the RFC got committed. Fix the build failure
by removing the code line that depends on that another patch set.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
 sound/soc/soc-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a7670d5..eb950f7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1644,7 +1644,6 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
 	/* mark codec as probed and add to card codec list */
 	codec->probed = 1;
 	list_add(&codec->card_list, &card->codec_dev_list);
-	list_add(&codec->dapm.list, &card->dapm_list);
 
 	/* now that all clients have probed, initialise the DAI link */
 	if (aux_dev->init) {
-- 
1.7.2.3

Re: [PATCH] ASoC: Fix build failure in soc-core.c

[Liam Girdwood]

On Wed, 2010-12-01 at 09:10 +0200, Jarkko Nikula wrote:
> Commit 2eea392 "ASoC: Add support for optional auxiliary dailess codecs"
> causes a build failure in soc-core.c: soc_probe_aux_dev since code tries to
> access non-existing struct snd_soc_dapm_context and struct snd_soc_card
> members.
> 
> Root cause for this was a double accident. Author sent the RFC patch from
> top of another patch set and the RFC got committed. Fix the build failure
> by removing the code line that depends on that another patch set.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> ---

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH] ASoC: Fix build failure in soc-core.c

[Mark Brown]

On Wed, Dec 01, 2010 at 09:10:47AM +0200, Jarkko Nikula wrote:
> Commit 2eea392 "ASoC: Add support for optional auxiliary dailess codecs"
> causes a build failure in soc-core.c: soc_probe_aux_dev since code tries to
> access non-existing struct snd_soc_dapm_context and struct snd_soc_card
> members.

Applied, thanks.