aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-12-01 02:10:47 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-01 06:33:58 -0500
commit06c6f4d34a23f7c9c783f1a875bb492b15fa23ac (patch)
tree386df84180d11f2bb2b758e30368fb0752bd8251
parent2eea392d0a28a0a07d36a9da544eb40f81bf4cb6 (diff)
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. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/soc-core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a7670d5ac13d..eb950f73076a 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)
1644 /* mark codec as probed and add to card codec list */ 1644 /* mark codec as probed and add to card codec list */
1645 codec->probed = 1; 1645 codec->probed = 1;
1646 list_add(&codec->card_list, &card->codec_dev_list); 1646 list_add(&codec->card_list, &card->codec_dev_list);
1647 list_add(&codec->dapm.list, &card->dapm_list);
1648 1647
1649 /* now that all clients have probed, initialise the DAI link */ 1648 /* now that all clients have probed, initialise the DAI link */
1650 if (aux_dev->init) { 1649 if (aux_dev->init) {