]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: adau1372: Fix clock leak on PLL lock failure
authorJihed Chaibi <jihed.chaibi.dev@gmail.com>
Wed, 25 Mar 2026 21:07:04 +0000 (22:07 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 26 Mar 2026 10:33:36 +0000 (10:33 +0000)
adau1372_enable_pll() was a void function that logged a dev_err() on
PLL lock timeout but did not propagate the error. As a result,
adau1372_set_power() would continue with adau1372->enabled set to true
despite the PLL being unlocked, and the mclk left enabled with no
corresponding disable on the error path.

Convert adau1372_enable_pll() to return int, using -ETIMEDOUT on lock
timeout and propagating regmap errors directly. In adau1372_set_power(),
check the return value and unwind in reverse order: restore regcache to
cache-only mode, reassert GPIO power-down, and disable the clock before
returning the error.

Signed-off-by: Jihed Chaibi <jihed.chaibi.dev@gmail.com>
Fixes: 6cd4c6459e47 ("ASoC: Add ADAU1372 audio CODEC support")
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Link: https://patch.msgid.link/20260325210704.76847-3-jihed.chaibi.dev@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/adau1372.c

index 6345342218d61d09b392f521f818272e1deeefef..d7363f9d53bb3195e528c331231cc77808771458 100644 (file)
@@ -762,7 +762,7 @@ static int adau1372_startup(struct snd_pcm_substream *substream, struct snd_soc_
        return 0;
 }
 
-static void adau1372_enable_pll(struct adau1372 *adau1372)
+static int adau1372_enable_pll(struct adau1372 *adau1372)
 {
        unsigned int val, timeout = 0;
        int ret;
@@ -778,8 +778,12 @@ static void adau1372_enable_pll(struct adau1372 *adau1372)
                timeout++;
        } while (!(val & 1) && timeout < 3);
 
-       if (ret < 0 || !(val & 1))
+       if (ret < 0 || !(val & 1)) {
                dev_err(adau1372->dev, "Failed to lock PLL\n");
+               return ret < 0 ? ret : -ETIMEDOUT;
+       }
+
+       return 0;
 }
 
 static int adau1372_set_power(struct adau1372 *adau1372, bool enable)
@@ -807,7 +811,14 @@ static int adau1372_set_power(struct adau1372 *adau1372, bool enable)
                 * accessed.
                 */
                if (adau1372->use_pll) {
-                       adau1372_enable_pll(adau1372);
+                       ret = adau1372_enable_pll(adau1372);
+                       if (ret) {
+                               regcache_cache_only(adau1372->regmap, true);
+                               if (adau1372->pd_gpio)
+                                       gpiod_set_value(adau1372->pd_gpio, 1);
+                               clk_disable_unprepare(adau1372->mclk);
+                               return ret;
+                       }
                        clk_ctrl |= ADAU1372_CLK_CTRL_CLKSRC;
                }