2022-07-19 01:48:03

by zhangzekun (A)

Subject: [PATCH -next v2] ASoC: Intel: Fix missing clk_disable_unprepare() on err in platform_clock_control()

Fix the missing clk_disable_unprepare() before return
from platform_clock_control() in error handling path.

Fixes: 9a87fc1e0619 ("ASoC: Intel: bytcr_wm5102: Add machine driver for BYT/WM5102")
Signed-off-by: Zhang Zekun <[email protected]>
---
sound/soc/intel/boards/bytcr_wm5102.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c
index 45a6805787f5..3e3cdee4b1ce 100644
--- a/sound/soc/intel/boards/bytcr_wm5102.c
+++ b/sound/soc/intel/boards/bytcr_wm5102.c
@@ -111,6 +111,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
ret = byt_wm5102_prepare_and_enable_pll1(codec_dai, 48000);
if (ret) {
dev_err(card->dev, "Error setting codec sysclk: %d\n", ret);
+ clk_disable_unprepare(priv->mclk);
return ret;
}
} else {
--
2.17.1

2022-07-19 14:50:13

by Pierre-Louis Bossart

Subject: Re: [PATCH -next v2] ASoC: Intel: Fix missing clk_disable_unprepare() on err in platform_clock_control()

On 7/18/22 20:36, Zhang Zekun wrote:
> Fix the missing clk_disable_unprepare() before return
> from platform_clock_control() in error handling path.
>
> Fixes: 9a87fc1e0619 ("ASoC: Intel: bytcr_wm5102: Add machine driver for BYT/WM5102")
> Signed-off-by: Zhang Zekun <[email protected]>
> ---
> sound/soc/intel/boards/bytcr_wm5102.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c
> index 45a6805787f5..3e3cdee4b1ce 100644
> --- a/sound/soc/intel/boards/bytcr_wm5102.c
> +++ b/sound/soc/intel/boards/bytcr_wm5102.c
> @@ -111,6 +111,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
> ret = byt_wm5102_prepare_and_enable_pll1(codec_dai, 48000);
> if (ret) {
> dev_err(card->dev, "Error setting codec sysclk: %d\n", ret);
> + clk_disable_unprepare(priv->mclk);

This change looks legit to me, but you want to CC: maintainers (Mark
Brown, Takashi Iwai), use the alsa-devel mailing list and CC: the
initial contributor Hans de Goede.

> return ret;
> }
> } else {