Commit fe33d4c5 authored May 14, 2012 by Stephen Warren Committed by Mark Brown May 16, 2012

ASoC: don't flip master of DT-instantiated DAI links



Commit 4924082 "ASoC: core: Flip master for CODECs in the CPU slot of a
CODEC<->CODEC link" added code that was conditional on there being no
PCM/DMA driver for the link. However, it failed to cover the case where
the link was instantiated from device tree, and hence was specified by
DT node rather than name.

This prevents the following error on Toshiba AC100:
aplay: pcm_write:1603: write error: Input/output error

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 018a455a

sound/soc/soc-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1612,7 +1612,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
		}

		/* If this is a regular CPU link there will be a platform */
		if (dai_fmt && dai_link->platform_name) {
		if (dai_fmt &&
		(dai_link->platform_name \|\| dai_link->platform_of_node)) {
		ret = snd_soc_dai_set_fmt(card->rtd[i].cpu_dai,
		dai_fmt);
		if (ret != 0 && ret != -ENOTSUPP)

Admin message