1. Patchew
  2. linux
  3. [PATCH v4 0/4] ASoC: Intel: Fix MCLK leaks in
  4. View patch

[PATCH v4 3/4] ASoC: Intel: cht_bsw_rt5672: Fix MCLK leak in platform_clock_control

aravindanilraj0702@gmail.com posted 4 patches 5 days, 8 hours ago
[PATCH v4 3/4] ASoC: Intel: cht_bsw_rt5672: Fix MCLK leak in platform_clock_control
Posted by aravindanilraj0702@gmail.com 5 days, 8 hours ago 
From: Aravind Anilraj <aravindanilraj0702@gmail.com>

If snd_soc_dai_set_pll() or snd_soc_dai_set_sysclk() fail inside the
EVENT_ON path, the function returns without calling
clk_disable_unprepare() on ctx->mclk, which was already enabled earlier
in the same code path. Add the missing clk_disable_unprepare() calls
before returning the error.

Signed-off-by: Aravind Anilraj <aravindanilraj0702@gmail.com>
---
 sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index 359723f2700e..e5806dc16ff9 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -67,7 +67,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
 			ret = clk_prepare_enable(ctx->mclk);
 			if (ret < 0) {
 				dev_err(card->dev,
-					"could not configure MCLK state");
+					"could not configure MCLK state\n");
 				return ret;
 			}
 		}
@@ -77,6 +77,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
 				CHT_PLAT_CLK_3_HZ, 48000 * 512);
 		if (ret < 0) {
 			dev_err(card->dev, "can't set codec pll: %d\n", ret);
+			clk_disable_unprepare(ctx->mclk);
 			return ret;
 		}
 
@@ -85,6 +86,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
 			48000 * 512, SND_SOC_CLOCK_IN);
 		if (ret < 0) {
 			dev_err(card->dev, "can't set codec sysclk: %d\n", ret);
+			clk_disable_unprepare(ctx->mclk);
 			return ret;
 		}
 	} else {
-- 
2.47.3
Re: [PATCH v4 3/4] ASoC: Intel: cht_bsw_rt5672: Fix MCLK leak in platform_clock_control
Posted by Cezary Rojewski 3 days, 5 hours ago 
On 2026-03-28 6:25 AM, aravindanilraj0702@gmail.com wrote:
> From: Aravind Anilraj <aravindanilraj0702@gmail.com>
> 
> If snd_soc_dai_set_pll() or snd_soc_dai_set_sysclk() fail inside the
> EVENT_ON path, the function returns without calling
> clk_disable_unprepare() on ctx->mclk, which was already enabled earlier
> in the same code path. Add the missing clk_disable_unprepare() calls
> before returning the error.
> 
> Signed-off-by: Aravind Anilraj <aravindanilraj0702@gmail.com>

Thank you for the fix.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>

> ---
>   sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
> index 359723f2700e..e5806dc16ff9 100644
> --- a/sound/soc/intel/boards/cht_bsw_rt5672.c
> +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
> @@ -67,7 +67,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
>   			ret = clk_prepare_enable(ctx->mclk);
>   			if (ret < 0) {
>   				dev_err(card->dev,
> -					"could not configure MCLK state");
> +					"could not configure MCLK state\n");
>   				return ret;
>   			}
>   		}
> @@ -77,6 +77,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
>   				CHT_PLAT_CLK_3_HZ, 48000 * 512);
>   		if (ret < 0) {
>   			dev_err(card->dev, "can't set codec pll: %d\n", ret);
> +			clk_disable_unprepare(ctx->mclk);
>   			return ret;
>   		}
>   
> @@ -85,6 +86,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
>   			48000 * 512, SND_SOC_CLOCK_IN);
>   		if (ret < 0) {
>   			dev_err(card->dev, "can't set codec sysclk: %d\n", ret);
> +			clk_disable_unprepare(ctx->mclk);
>   			return ret;
>   		}
>   	} else {
Re: [PATCH v4 3/4] ASoC: Intel: cht_bsw_rt5672: Fix MCLK leak in platform_clock_control
Posted by Cezary Rojewski 3 days, 5 hours ago 
On 2026-03-30 10:33 AM, Cezary Rojewski wrote:
> On 2026-03-28 6:25 AM, aravindanilraj0702@gmail.com wrote:
>> From: Aravind Anilraj <aravindanilraj0702@gmail.com>
>>
>> If snd_soc_dai_set_pll() or snd_soc_dai_set_sysclk() fail inside the
>> EVENT_ON path, the function returns without calling
>> clk_disable_unprepare() on ctx->mclk, which was already enabled earlier
>> in the same code path. Add the missing clk_disable_unprepare() calls
>> before returning the error.
>>
>> Signed-off-by: Aravind Anilraj <aravindanilraj0702@gmail.com>
> 
> Thank you for the fix.
> 
> Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
> 
>> ---
>>   sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/ 
>> intel/boards/cht_bsw_rt5672.c
>> index 359723f2700e..e5806dc16ff9 100644
>> --- a/sound/soc/intel/boards/cht_bsw_rt5672.c
>> +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
>> @@ -67,7 +67,7 @@ static int platform_clock_control(struct 
>> snd_soc_dapm_widget *w,
>>               ret = clk_prepare_enable(ctx->mclk);
>>               if (ret < 0) {
>>                   dev_err(card->dev,
>> -                    "could not configure MCLK state");
>> +                    "could not configure MCLK state\n");


I've overlooked the string changes.  For all three leading patches, 
please ensure only clk_disable_unprepare() is part of them.  The updates 
to the dev_err() make the patches non-atomic and you already have a 
dedicated patch for dev_err() - the fourth patch.  Do those changes there.

>>                   return ret;
>>               }
>>           }

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.