2021-09-15 03:48:27

by Trevor Wu (吳文良)

[permalink] [raw]
Subject: [PATCH] ASoC: mediatek: mt6359: Fix unexpected error in bind/unbind flow

mt6359-sound is a MFD driver. Because its regmap is retrieved from its
parent, it shouldn't be freed in mt6359-sound driver.

snd_soc_component_exit_regmap() will do regmap_exit(), this results in
unexpected results if sound card unregister flow is invoked when users
try to bind/unbind audio codec.

Remove the usage of snd_soc_component_exit_regmap(). Instead, set
component->regmap = NULL in the component remove function.

Signed-off-by: Trevor Wu <[email protected]>
---
sound/soc/codecs/mt6359.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/mt6359.c b/sound/soc/codecs/mt6359.c
index 2d6a4a29b850..f8532aa7e4aa 100644
--- a/sound/soc/codecs/mt6359.c
+++ b/sound/soc/codecs/mt6359.c
@@ -2697,7 +2697,7 @@ static int mt6359_codec_probe(struct snd_soc_component *cmpnt)

static void mt6359_codec_remove(struct snd_soc_component *cmpnt)
{
- snd_soc_component_exit_regmap(cmpnt);
+ cmpnt->regmap = NULL;
}

static const DECLARE_TLV_DB_SCALE(hp_playback_tlv, -2200, 100, 0);
--
2.18.0


2021-09-15 15:24:28

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: mediatek: mt6359: Fix unexpected error in bind/unbind flow

On Wed, 15 Sep 2021 11:46:59 +0800, Trevor Wu wrote:
> mt6359-sound is a MFD driver. Because its regmap is retrieved from its
> parent, it shouldn't be freed in mt6359-sound driver.
>
> snd_soc_component_exit_regmap() will do regmap_exit(), this results in
> unexpected results if sound card unregister flow is invoked when users
> try to bind/unbind audio codec.
>
> [...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: mediatek: mt6359: Fix unexpected error in bind/unbind flow
commit: 6d66c5ccf5cb8af866fe2bb014098a3dd7bfa3cc

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark