On 2/6/19 11:05, Charles Keepax wrote:
> DAIs linked to the dummy will not have an associated playback/capture
> widget, so we need to skip the update in that case.
>
> Fixes: 078a85f2806f ("ASoC: dapm: Only power up active channels from a DAI")
> Signed-off-by: Charles Keepax <ckee...@opensource.cirrus.com>
Tested-by: Sylwester Nawrocki <s.nawro...@samsung.com>
> ---
>
> Ok so that all makes sense, this patch is probably the best fix?
It seems so, everything works well with such change, thank you.
> sound/soc/soc-dapm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> index 482ddb825fb59..5235d8828758a 100644
> --- a/sound/soc/soc-dapm.c
> +++ b/sound/soc/soc-dapm.c
> @@ -2570,6 +2570,9 @@ static int dapm_update_dai_unlocked(struct
> snd_pcm_substream *substream,
> else
> w = dai->capture_widget;
>
> + if (!w)
> + return 0;
> +
> dev_dbg(dai->dev, "Update DAI routes for %s %s\n", dai->name,
> dir == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture");
>
