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 --- sound/soc/soc-dai.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 0119afbd01fc..02dd64dea179 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -542,6 +542,9 @@ int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order) if (dai->driver->probe_order != order) continue;

+ if (dai->probed) + continue; + if (dai->driver->probe) { int ret = dai->driver->probe(dai);