Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: soc-dai.c: add missing flag check at snd_soc_pcm_dai_probe()

dai->probed is used at snd_soc_pcm_dai_probe/remove(),
and used to call real remove() function only when it was probed.

int snd_soc_pcm_dai_probe(...)
{
...
for_each_rtd_dais(rtd, i, dai) {
...

if (dai->driver->probe) {
(A) int ret = dai->driver->probe(dai);

if (ret < 0)
return soc_dai_ret(dai, ret);
}

=> dai->probed = 1;
}
...
}

int snd_soc_pcm_dai_remove(...)
{
...
for_each_rtd_dais(rtd, i, dai) {
...
=> if (dai->probed &&
...) {
...
}

=> dai->probed = 0;
}
...
}

But on probe() case, we need to check dai->probed before calling
real probe() function at (A), otherwise real probe() might be called
multi times (but real remove() will be called only once).
This patch checks it at probe().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wn3u64e6.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
5c5a7521 9c3bd790

+3
+3
sound/soc/soc-dai.c
··· 542 542 if (dai->driver->probe_order != order) 543 543 continue; 544 544 545 + if (dai->probed) 546 + continue; 547 + 545 548 if (dai->driver->probe) { 546 549 int ret = dai->driver->probe(dai); 547 550