From: "Nuno Sá" <noname.nuno@gmail.com>
To: Jihed Chaibi <jihed.chaibi.dev@gmail.com>,
lars@metafoo.de, nuno.sa@analog.com
Cc: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
tiwai@suse.com, linux-sound@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] ASoC: adau1372: Fix clock leak on PLL lock failure
Date: Thu, 26 Mar 2026 09:31:10 +0000 [thread overview]
Message-ID: <0e89c8c2b5851211b2c1f2dc413e6775ab46364b.camel@gmail.com> (raw)
In-Reply-To: <20260325210704.76847-3-jihed.chaibi.dev@gmail.com>
On Wed, 2026-03-25 at 22:07 +0100, Jihed Chaibi wrote:
> 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>
> ---
Also deserves a Fixes tag IMO.
> Changes in v2:
> - Also unwind regcache and GPIO power-down state on PLL lock failure,
> as noted by Mark Brown.
>
> sound/soc/codecs/adau1372.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/adau1372.c b/sound/soc/codecs/adau1372.c
> index 6345342218d6..e3eba241bdf7 100644
> --- a/sound/soc/codecs/adau1372.c
> +++ b/sound/soc/codecs/adau1372.c
> @@ -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;
> }
>
> --
> 2.47.3
next prev parent reply other threads:[~2026-03-26 9:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-25 21:07 [PATCH v2 0/2] ASoC: adau1372: Fix error handling in adau1372_set_power() Jihed Chaibi
2026-03-25 21:07 ` [PATCH v2 1/2] ASoC: adau1372: Fix unchecked clk_prepare_enable() return value Jihed Chaibi
2026-03-26 9:27 ` Nuno Sá
2026-03-25 21:07 ` [PATCH v2 2/2] ASoC: adau1372: Fix clock leak on PLL lock failure Jihed Chaibi
2026-03-26 9:31 ` Nuno Sá [this message]
2026-03-26 9:31 ` [PATCH v2 0/2] ASoC: adau1372: Fix error handling in adau1372_set_power() Nuno Sá
2026-03-26 9:42 ` Jihed Chaibi
2026-03-26 10:33 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0e89c8c2b5851211b2c1f2dc413e6775ab46364b.camel@gmail.com \
--to=noname.nuno@gmail.com \
--cc=broonie@kernel.org \
--cc=jihed.chaibi.dev@gmail.com \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=nuno.sa@analog.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox