Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E711227CB04 for ; Mon, 5 Jan 2026 14:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767623253; cv=none; b=WgB7J5A6GbANctL2KNFzO7Dw3eMnJIosaMPsXUaxzmtZyGcGswmDj51rQWPV6Ydxm6KAHazr9zW4ScFI2jL8HIyv5rjwkEWmA+MxqH0CNTCfa7rCImXybC4hTRJplVK78Y/X6g/bRY0jtPRxReqNIMtNn6S/oTqdEvOT+5UBW8I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767623253; c=relaxed/simple; bh=6O0BJqphH1lkIKFJagxuHkZagy9+D/iyZeehlWHh660=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PGirXHAp3WQfhulP8XPP6v3Nx6AaLm6+xPYtOqxDerFpzbSVYjwbGuZngxIP5Jsf27ZBrRvJF9c4ltWYptLAaI60NKdbXtAL5AR6nnukVZT/uzz+WIxa8E40bMuPB/7pERGP4xBxlnt/CP2hZ+3ChDOQswTR8hqxmuHWlwE0JBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IuZYyHWB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IuZYyHWB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11B11C19424; Mon, 5 Jan 2026 14:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767623252; bh=6O0BJqphH1lkIKFJagxuHkZagy9+D/iyZeehlWHh660=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IuZYyHWBN98U0NLcUP30/m7U9NzJDF30foKvuzWhkhYxJCjpS59fu1ygP0bNcjX0P lbH7XXn3+1qEJwj0BlbZSpCJUpd8P5g5BTMvnPN/x2Ex87FL7uCiPNjjQhO0AGrnRF QE4jQIPLNM7YkS6iEE3D+fXC07Ck2kTALrG3DRoWAMKPsFpd0bNbAfEeoij0PXczKe d66iPp0xkm4azSElaVB1T/xZAsgBH/W544iu5p//hm5wQG0NQr6xXvW5oREhqvEM4O HiJ1x/boqSTpEDTn5TK69QV1NE1dFDT1dUYX/fx7QdZRGMrhVbc/nv4UzGfp29yl/J IMEFhuz+HUEFg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Olivier Moysan , olivier moysan , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y 3/3] ASoC: stm32: sai: fix clk prepare imbalance on probe failure Date: Mon, 5 Jan 2026 09:27:28 -0500 Message-ID: <20260105142728.2602716-3-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260105142728.2602716-1-sashal@kernel.org> References: <2026010531-vendor-unissued-6b5a@gregkh> <20260105142728.2602716-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 312ec2f0d9d1a5656f76d770bbf1d967e9289aa7 ] Make sure to unprepare the parent clock also on probe failures (e.g. probe deferral). Fixes: a14bf98c045b ("ASoC: stm32: sai: fix possible circular locking") Cc: stable@vger.kernel.org # 5.5 Cc: Olivier Moysan Signed-off-by: Johan Hovold Reviewed-by: olivier moysan Link: https://patch.msgid.link/20251124104908.15754-3-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/stm/stm32_sai_sub.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 15f8322d2e43..2a2fc2f0ebbd 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1484,14 +1484,21 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, if (of_find_property(np, "#clock-cells", NULL)) { ret = stm32_sai_add_mclk_provider(sai); if (ret < 0) - return ret; + goto err_unprepare_pclk; } else { sai->sai_mclk = devm_clk_get_optional(&pdev->dev, "MCLK"); - if (IS_ERR(sai->sai_mclk)) - return PTR_ERR(sai->sai_mclk); + if (IS_ERR(sai->sai_mclk)) { + ret = PTR_ERR(sai->sai_mclk); + goto err_unprepare_pclk; + } } return 0; + +err_unprepare_pclk: + clk_unprepare(sai->pdata->pclk); + + return ret; } static int stm32_sai_sub_probe(struct platform_device *pdev) @@ -1535,26 +1542,33 @@ static int stm32_sai_sub_probe(struct platform_device *pdev) IRQF_SHARED, dev_name(&pdev->dev), sai); if (ret) { dev_err(&pdev->dev, "IRQ request returned %d\n", ret); - return ret; + goto err_unprepare_pclk; } if (STM_SAI_PROTOCOL_IS_SPDIF(sai)) conf = &stm32_sai_pcm_config_spdif; ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0); - if (ret) - return dev_err_probe(&pdev->dev, ret, "Could not register pcm dma\n"); + if (ret) { + ret = dev_err_probe(&pdev->dev, ret, "Could not register pcm dma\n"); + goto err_unprepare_pclk; + } ret = snd_soc_register_component(&pdev->dev, &stm32_component, &sai->cpu_dai_drv, 1); if (ret) { snd_dmaengine_pcm_unregister(&pdev->dev); - return ret; + goto err_unprepare_pclk; } pm_runtime_enable(&pdev->dev); return 0; + +err_unprepare_pclk: + clk_unprepare(sai->pdata->pclk); + + return ret; } static int stm32_sai_sub_remove(struct platform_device *pdev) -- 2.51.0