Skip to contentSkip to conversation

ASoC: dapm: Check for NULL widget in dapm_update_dai_unlocked

PATCH New Charles Keepax 1 participant 1 message Feb 6, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: dapm: Check for NULL widget in dapm_update_dai_unlocked

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")
---
 sound/soc/soc-dapm.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/soc-dapm.c +3 -0
index 5b74dffc9c11d..111a23a9708a2 100644
@@ -2580,6 +2580,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");
 
Signature · 1 line
2.11.0