Commit fe33d4c5 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown

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: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 018a455a
...@@ -1612,7 +1612,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -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 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, ret = snd_soc_dai_set_fmt(card->rtd[i].cpu_dai,
dai_fmt); dai_fmt);
if (ret != 0 && ret != -ENOTSUPP) if (ret != 0 && ret != -ENOTSUPP)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment