Skip to contentSkip to conversation

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

PATCH Applied Stephen Rothwell 4 participants 4 messages Dec 1, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#1 lore raw

PATCH 1/1 ASoC: Fix build failure in soc-core.c

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.

---
 sound/soc/soc-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +0 -1
index a7670d5..eb950f7 100644
@@ -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) {
Signature · 1 line
1.7.2.3
Acked-by on v1 1/1
#2 lore raw

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

Quoted 11 lines · 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.

---

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
Applied
#3 lore raw

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

In reply to Jarkko Nikula
Quoted 4 lines · 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.

Applied, thanks.