]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ASoC: soc-dai.c: add missing flag check at snd_soc_pcm_dai_probe()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 6 Mar 2023 01:43:30 +0000 (01:43 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:26:03 +0000 (16:26 +0200)
commitbec4296a8523498ab9543ba5d2d5d5a781257e99
tree05aad0d62b48d02ba5f2914cd1d09c40895c25b8
parentf0a67dc70b782d0e79c3dd9424f38b9c1fc0e5d2
ASoC: soc-dai.c: add missing flag check at snd_soc_pcm_dai_probe()

[ Upstream commit 5c5a7521e9364a40fe2c1b67ab79991e3e9085df ]

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>
Stable-dep-of: 0e270f32975f ("ASoC: fsl_sai: replace regmap_write with regmap_update_bits")
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/soc-dai.c