]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: cht_bsw_rt5672: Fix MCLK leak on platform_clock_control error
authorAravind Anilraj <aravindanilraj0702@gmail.com>
Wed, 1 Apr 2026 22:05:06 +0000 (18:05 -0400)
committerMark Brown <broonie@kernel.org>
Fri, 3 Apr 2026 14:15:01 +0000 (15:15 +0100)
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>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20260401220507.23557-4-aravindanilraj0702@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/cht_bsw_rt5672.c

index 359723f2700e466aee46c379c76fc46de5e7a48a..57d6997eb12fff0579177b5e9148b9c1f34d2c08 100644 (file)
@@ -77,6 +77,8 @@ 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);
+                       if (ctx->mclk)
+                               clk_disable_unprepare(ctx->mclk);
                        return ret;
                }
 
@@ -85,6 +87,8 @@ 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);
+                       if (ctx->mclk)
+                               clk_disable_unprepare(ctx->mclk);
                        return ret;
                }
        } else {