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 01593C61DB9 for ; Fri, 28 Aug 2026 09:16:21 +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=IlDfgda0dYFq9rxw3JdEQPpWay5cHlVA/Z3MyCDCs5g=; b=ZeAyA1AEhCIuTmhWNsas5/Fmz2 UItaQkyJRX9POwKY3Ofcb9vzN3IyniigbDUWHz0SXrA6iAdYSPzoeQJNJFL4JVGb6eDMpAJRe3Kja ZDjz2acfc1QiZlUCop53B78RWWjQ2hjjEMmSgU38gUuIc8dASrT2hXqh1fzK7sLS7/ACINBKHjOu4 Lxy/Jj88VvYMjW7Kx94i0aOjgP7iFemQm8CSukXowOMM7CevxaJjJV7t+2d9BoWjcmg9trHR4y6xd yk39dULfogQA8rjeMsf+qIBHi/DVV/Wmid4mJuQQoQWi0X++21bJxypFkAcOUnXUX48mg0TUfLzpY 8KTq9LZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wzshA-00000005QRY-2pBJ; Fri, 28 Aug 2026 09:16:20 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wzsh6-00000005QMt-3Bse for linux-mediatek@lists.infradead.org; Fri, 28 Aug 2026 09:16:17 +0000 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-8548db7428aso639199b3a.1 for ; Fri, 28 Aug 2026 02:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787908576; x=1788513376; 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=IlDfgda0dYFq9rxw3JdEQPpWay5cHlVA/Z3MyCDCs5g=; b=ZDZvMma8kxtBZ0Sf1ZZoc0EQe2r5aAbiP2jq9fmnzTF205j3sOXgaw+NIAtI0qkGj/ I0mV5yXZn31ypmeBK5fibVH8+GN0vbCfY1TcG7DHA+MqxwaOe2I+92Y6dGfLdtuEG+y/ mTWwWZFkMI4sWi9Bpb0QsrlwlY9ENxCKS+d480IHeMfSn73QSArSP24e9tJuk5FqKE0r /xtwZ402ZJxzTqUlvv1XUfDP7OiELC+1pz16K9Whf6Ynex3bYSJMSi8rkqQVq1DsTr05 B6Th2aqMv43n3n9d5dZvKDnaKVGgX/7wZ1OfU42wNtTSKmcjcj+dFnlW7pzhuyfjaw9v HqMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787908576; x=1788513376; 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=IlDfgda0dYFq9rxw3JdEQPpWay5cHlVA/Z3MyCDCs5g=; b=ZsmF1N1N8e1UCdbiPdv6Fy/6SZ9klWlrTJDdrEFEuk7G219TyEnbQgRMNa3xPsnNlx e2NunPYItO6Y/7OqFfGywQnknu2Fjw3XOCmB6xMmCuNEWGJaV4sLB/3OCPOLXm0s6wh9 0ZNYA82CjYv3sRXswLDWqK6BX21+eRxHFREbv04PZKoS6ceqysjO/3cKYDOygyHtUe4D dSG3wwgrKjpfEfC/HfiLNp/qzV+Asadro+IAZg83eCs0SUSJRvDvkaGw23QEJOxfScPZ U7NdtqzwCKUWPO7lX6FpIXvrcO+n+t0Q5XGWpLHsbvep5d9E01IyDl54inJSjSKIPizn 6f/g== X-Forwarded-Encrypted: i=1; AHgh+RpRUUAySx5cGqFxYY2zOWuMN/2juAWIuDHrGoxHFjckDjVJtgGUhkLcrnFBdp1waOOF1o3thi/rRtUh3f8wdw==@lists.infradead.org X-Gm-Message-State: AFuF++mAIcQtPkhqnXtwnOOGT41sikQlk89ndlMQlSTWhP7lR+SmmF70 kFv8wtQ2E4i/oCEiQZXNKmOCFecEPadG387rAHGvJ4srYHGKwPN+JChK X-Gm-Gg: AR+sD12w4LS6kx00iM7wtvqeNNHn6dfj4S/f1F9lv59AbtuKoj1cY2N6Wxw8bpBoyYh qAq/0bVXICkaWPftkbU9fI6UPN/sHJsdOFVwXOqnf3WQReMr8jxfrNZlAaxlQ5s81nPWkRl7BSk +RIFr6FpZwsTB/BV5wVZO1xJo4isjBXJsciq6C1uI2/9lYB43rgTgpx9Y8K+aGyqQj9QOdp+Lde txYhSFmjlfYyZfHUlgUUg+GpQciaDM998mhKrIb3EeV6zn1aIDND2r/EwVJMXeIl4+CRbJHslpX x51zQuONC2BqXvwLJccxfslWKEEcqgor1f851g6q16KGzLmwJYbjjhd1YnocmApI16p6THFcQyX sJvgdVX61tcpr2nTktwRa2jm5C6A4NLkxL2xPT//SNDJUCoslrXDWX/88xPF/ZyP9eBtamGUPB+ /WAX6kkegLn8X5nrNuP1SEi+ApOb7eRoP784HQipLc7MrEPRKwpD38+X/msmWEwlRzHXIxLEIMv xYONzG5dWQ8ouYH33JGOdbyb9xHvSn4GD1j0M/79vb68+zZhUz1NmIJZ32XNqbhonuU4Hm5wHjD Bj7w X-Received: by 2002:a05:6a00:c83:b0:853:6571:9567 with SMTP id d2e1a72fcca58-85626f06dcbmr11500046b3a.4.1787908575762; Fri, 28 Aug 2026 02:16:15 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8569fe78fc3sm381248b3a.24.2026.08.28.02.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2026 02:16:15 -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 4/8] ASoC: mediatek: mt8186: Fix APLL enable error handling Date: Fri, 28 Aug 2026 16:15:28 +0700 Message-ID: <20260828091532.600047-5-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260828091532.600047-1-phucduc.bui@gmail.com> References: <20260828091532.600047-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-20260828_021616_800247_4099E828 X-CRM114-Status: GOOD ( 11.69 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: bui duc phuc Currently, the mt8186_apll*_enable() functions call mux_setting(afe, true) but do not check its return value to handle failures. In addition, the cleanup paths of mt8186_apll*_enable() do not call mux_setting(afe, false) when the enable operation fails, while the mt8186_apll*_disable() functions do. Add error handling for apll*_mux_setting() and call mux_setting(afe, false) in the cleanup paths when mt8186_apll*_enable() fails. Fixes: 55b423d5623c ("ASoC: mediatek: mt8186: support audio clock control in platform driver") Signed-off-by: bui duc phuc --- Changes in v3: - Return directly from apllx_mux_setting() instead of using a goto label sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c index b3e938088a7b..85fe828ca5ae 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c @@ -361,7 +361,9 @@ int mt8186_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) { @@ -386,9 +388,9 @@ int mt8186_apll1_enable(struct mtk_base_afe *afe) return 0; err_clk_apll1_tuner: - clk_disable_unprepare(afe_priv->clk[CLK_APLL1_TUNER]); + clk_disable_unprepare(afe_priv->clk[CLK_APLL22M]); err_clk_apll22m: - clk_disable_unprepare(afe_priv->clk[CLK_APLL22M]); + apll1_mux_setting(afe, false); return ret; } @@ -414,7 +416,9 @@ int mt8186_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) { @@ -439,9 +443,9 @@ int mt8186_apll2_enable(struct mtk_base_afe *afe) return 0; err_clk_apll2_tuner: - clk_disable_unprepare(afe_priv->clk[CLK_APLL2_TUNER]); + clk_disable_unprepare(afe_priv->clk[CLK_APLL24M]); err_clk_apll24m: - clk_disable_unprepare(afe_priv->clk[CLK_APLL24M]); + apll2_mux_setting(afe, false); return ret; } -- 2.43.0