From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D04CC61DB9 for ; Fri, 28 Aug 2026 05:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=K2ayKEtWylWEqAbqXks4/0qXdOEmw8tXU6KwY1JgJjU=; b=D4MEcf3ohZIhEKHBVb2yrNtuGu X8UsV3ZukKiLXxji0DxZ9FYoR7SGVKe2lYw392/4/Zb1sJ1jiyM88xwtVnNknAZPysTGZKbiSrSP5 twqT4bRDRGPEYAUWEfihTZ+ueRYDOJF5qgih+9f2a2NZ8FaxdV52NYApTLg9IoBREzsOpj3DpzGPz n+AExYgrJx+cAx3uw2zv8y+KYkhXUdSMJcuYQxwqikQ5SfTb5FCQ0qqhXhB6S8tnup0mZYJNiaLOM 1LXiduGgUiDaQxChJCdegzzjwsdNHoN+exbourFqMjPhijatIjU4PyUJCfDZOh3LsrlbDCq3R9Uxv fERrmNoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wzon6-000000057zk-2qRN; Fri, 28 Aug 2026 05:06:12 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wzomy-000000057sf-0pwG for linux-arm-kernel@lists.infradead.org; Fri, 28 Aug 2026 05:06:05 +0000 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-396b3d0df94so736291a91.1 for ; Thu, 27 Aug 2026 22:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787893563; x=1788498363; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=K2ayKEtWylWEqAbqXks4/0qXdOEmw8tXU6KwY1JgJjU=; b=cG521kU+iFg/6I8eEb6A1JS7cBCsnRh0oFdAQ/WrcEYMBGcvpiGc+uTD/kcqu+oZiP ImbkeqqcJFsv3mnqQdUJ5gUtIYEpF67rDheALDMpRkjSgwOe0Ft6I1gmXTu6n9ILgtxS YmddQd1o46Puq2NGlHMqkbK6ffCTU0R7dEPDySSgzCPe32H7mbTROxIx0+te4p/4iuQ8 T08xGdeTy2iakYXQT3S1z/ZZMaAVQuI9NkpoHqez/tgF+MwFG6AduZ/TduqFYC9MFZUi 8wRBYOJKMBfqhx2wn9whS8pKy0xzvK4dGgUAg8hIgjcGkPGzxfegbOFB2/Wu5aou5pfQ sTAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787893563; x=1788498363; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=K2ayKEtWylWEqAbqXks4/0qXdOEmw8tXU6KwY1JgJjU=; b=jth4ult4tp35Z+8hjZUqbYpU+qe+LoztRnUNTIvBSj7hJ7Rh/ucFGPC1PNMfCDCsVj 1jUC0nJpUb+lQraH7g0ngiIUzLdArJSaR5CYDpdpSrQoG+ARFbfdJ1mQsGRbxI2ejWvK Hn9FVhCha4c6Hvds9JIfn+96iVdL3lxhy6JZwY6pPh0FGIyMQCBq8854CnWM3QgLDelY DpxbHhepVGX3+3bgnO+RIIGsUfpPmRiosN0LKH3I8RPHdKUoK8G3d/SIwEuEzGEyXrjE X9Jll7PUc7R7y6AVqKODBFsK0rZ9FJusyJ2N7VzWJJSrCX/9Bz13nNrhZDByrMIJqNFW KJIw== X-Forwarded-Encrypted: i=1; AHgh+Rq8DndmziPxFrDzlS3YJtvaZFNvmjCPixzwrzc0dOCwX7pyL2q6CF/g/ouBKR9/F9Hcvt8RiEPcXOKPtsSZNVBI@lists.infradead.org X-Gm-Message-State: AFuF++nnlfNDR22aW4smmy2fhCJkEupCjpsLqogNXhldi6r4Z5RE8XcS xApr0HLQmOi+AZ6+UEScGuxUdsuEymta+A7YRPX/Me20IqDhwUiyt7Qk X-Gm-Gg: AR+sD10B4mDmz+B0rl82k8u8zzWu+IGDRpC22ftgKSW0LzyTJSM9cuDumXJ+tKlOrDY Zrrf/mov0Ey4hwGOOuGYmoTdVXH1fvd8eJA/rwc+OxPCCqPiINB2MSxXSdW0NhS9sgTJGra4jGc 8PGW0CDWedW2qfR4wxnq0ONbQeCEYINluQ7wHBSQxGVuXI55Ps1P9ngOWiemTaqbDjksCNgGtJr zG1ZX65WlMazXvp0OxiHP/k/rzDomyTGWS8ypU9PZ5LLJgeHYP5QR0ssN5a2ewUvQcauZwurZ68 agbVnZLDafX0J4FguPzYC+dMZ8KS0i8WcgdDHuOL9u3upOLlbw6lW6NtwjaaZjlFmhmk3qyFQuQ 22xBf69SLBWUmGR3GKlBfseK9kClLTHbOavy3Mw6sTY9/DOhAsbMhykWcWJii8OsA9Om+j2UAYO WUM5EnHVfAgcbZ/eIJZftLP+4p9dWBzdufOzI/X3PwHpW76xQLMKeN6X0gz++0PHqRZR32oI80i D2UJZ71M+vIPBN6rygxadmBl9Yt9uYymXror3Z0mDTZChJDiEE+/ndT8hkPlz5ZL13EMzTcF+bN e41sTe2wtEB7HMk= X-Received: by 2002:a17:90a:d2c6:b0:392:c80b:8eff with SMTP id 98e67ed59e1d1-396d0f6cb36mr8700122a91.11.1787893563290; Thu, 27 Aug 2026 22:06:03 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-396dda7c922sm986549a91.7.2026.08.27.22.06.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 22:06:03 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Matthias Brugger Cc: Liam Girdwood , AngeloGioacchino Del Regno , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH v3 3/5] ASoC: mediatek: mt8183: Fix APLL enable error handling Date: Fri, 28 Aug 2026 12:05:24 +0700 Message-ID: <20260828050526.590761-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260828050526.590761-1-phucduc.bui@gmail.com> References: <20260828050526.590761-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260827_220604_245155_65843CF5 X-CRM114-Status: GOOD ( 13.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: bui duc phuc Currently, the mt8183_apll*_enable() functions call mux_setting(afe, true) but do not check its return value to handle failures. In addition, the cleanup paths of mt8183_apll*_enable() do not call mux_setting(afe, false) when the enable operation fails, while the mt8183_apll*_disable() functions do. Add error handling for apll*_mux_setting() and call mux_setting(afe, false) in the cleanup paths when mt8183_apll*_enable() fails. Fixes: a94aec035a12 ("ASoC: mediatek: mt8183: add platform driver") Signed-off-by: bui duc phuc --- Changes in v3: - Return directly from apllx_mux_setting() instead of using a goto label, as suggested by Cezary. sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-clk.c b/sound/soc/mediatek/mt8183/mt8183-afe-clk.c index 2dbe0b7f8bad..43d5898357dd 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-clk.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-clk.c @@ -384,7 +384,9 @@ int mt8183_apll1_enable(struct mtk_base_afe *afe) int ret; /* setting for APLL */ - apll1_mux_setting(afe, true); + ret = apll1_mux_setting(afe, true); + if (ret) + return ret; ret = clk_prepare_enable(afe_priv->clk[CLK_APLL22M]); if (ret) { @@ -413,6 +415,8 @@ int mt8183_apll1_enable(struct mtk_base_afe *afe) ERR_CLK_APLL1_TUNER: clk_disable_unprepare(afe_priv->clk[CLK_APLL22M]); ERR_CLK_APLL22M: + apll1_mux_setting(afe, false); + return ret; } @@ -438,7 +442,9 @@ int mt8183_apll2_enable(struct mtk_base_afe *afe) int ret; /* setting for APLL */ - apll2_mux_setting(afe, true); + ret = apll2_mux_setting(afe, true); + if (ret) + return ret; ret = clk_prepare_enable(afe_priv->clk[CLK_APLL24M]); if (ret) { @@ -467,6 +473,8 @@ int mt8183_apll2_enable(struct mtk_base_afe *afe) ERR_CLK_APLL2_TUNER: clk_disable_unprepare(afe_priv->clk[CLK_APLL24M]); ERR_CLK_APLL24M: + apll2_mux_setting(afe, false); + return ret; } -- 2.43.0