Commit 06c6f4d3 authored Dec 01, 2010 by Jarkko Nikula Committed by Mark Brown Dec 01, 2010

ASoC: Fix build failure in soc-core.c



Commit 2eea392d "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>

parent 2eea392d

sound/soc/soc-core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message