From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4386F3655E4 for ; Fri, 21 Aug 2026 12:29:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787315344; cv=none; b=V/jQPccLZ06tRQFIY5ruTpeXgH4EGNHBuCsmccBHoxGw17Mu9gsrwq1ghYmsahtYmXXYy+aZOEE0w3T6MZkgBI5iGjdVEDj9OWHj/vZOQNe+jXdzXNYF+NWw6KyMk8J6igI8EpH8COaVgrEGHkCfm445qLhMRy6jlHssrwVxr7w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787315344; c=relaxed/simple; bh=5KktxiklsF/0QCkN3dKJ354QFQXWmjZRHfGMH6yZW44=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e/iKeR8+mbQ6f7clvGO1VxJFbomcJ0g7JRpY2s/+ljeEe8+Fv4jk4wgfbO4kWiGlq9mBg6QFYsZGWhp0uZwUrq+Wcv+Ix0gHC9pAG/fRSUtQAU14L6n3whbQLxIOJeI8NeVbabhL34/dyDku87p3FiznrGR6WSuvQ26A86+Bb7E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RqIBjrux; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RqIBjrux" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ce98cb8165so8020615ad.1 for ; Fri, 21 Aug 2026 05:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787315338; x=1787920138; darn=vger.kernel.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=7EdEJgY9D5VmAtVYQAvmQy6QO5FD2ftLDiJehs4hR10=; b=RqIBjruxWSEX+t9H9aOzZgXh9Jk8lVGcWZWJxcHmnjPCbb/2CMIqwUftJDsG/jui8k WUOmPb+djfmaUJVfH/JVZ0qQua0tG9FFYEQEK8Z+2NjBbf5RLxr/+GKvpGe4r85PL7U0 Bgarc1NIejHzxB9m7P7Op+LaFKCam7J5jqSrNMWdA3WDVI64R6wairW560PplTm9QMSZ lYZ9b8faSOebj2WsY8rvuwxuT9tvvDFcYuleWGxvDWKPyzlORU8gtN+3VCFJHyxKCe/o UUztpIl4IgKO+kufsYva2mWMr0c9rEobSmo6tIWH9wazl4iKN2qs7U6cO14x21wPNq9t HA+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787315338; x=1787920138; 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=7EdEJgY9D5VmAtVYQAvmQy6QO5FD2ftLDiJehs4hR10=; b=dDvrVyCy3QlrsEh34hxaIO9+VT4OshaXGPlDJ+2McOnY4fuu2hx2JZmgbjHr9f5sxp 26ZYppWPVGOxFKl4q6EnUldkvxl8XADKFJAzPpsJprzuNZLvfKyY41p+2bCCuLUHUi/s zR1CyxweIazNUXg8UrtV68Df8BPKJP+Cxkrml1lUGVQ+9uTxqy+zF0MNLl07wg3t7DPI 10dLGrkdrNFDP/vQRqjsAu06Vj6NL+Ir1cO07Wu6fsNzEHpZbFj6y56/tObSY9pTwRCF zR5+CUcCmhNxjUeROF1uLWT9vAx3fTn77Lqequefuvs5uKlL1Hr84/gFxmA9HjaoFp1C PIFA== X-Forwarded-Encrypted: i=1; AHgh+RpnDPG9JMFwvinrp22wrJdDaOluQfq4coVoj/TlcbMcf/y8lFIi0Kg00hGn9IMna0czhsQp+k02dd9VfsA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxa3OinAZBTyJfjCjEvz40XiYxEqZ12hJE9URJF1zZi1OCb+93B K2uSWEMd5b+bp/eIbpWM87XDF00wxA0Z7kFTSQY4uOQP4i9b61ufVARH X-Gm-Gg: AR+sD13Jqp2VLrK3NX+7B6inrecAoWSnTNXrXQQ23g7yMvQm62jK5Ppyrk2NAzCbuR5 ik7/0YGqNiOLhhpjstlpRLIalEZ7bzM2l715ezvwEm/KKw30IfU/sS/R0oMLWFHpqZVp9IXljmZ JRAwdesFkVieEfyaTrewN5gW6FjLT/gLdfL8s/IQGGm8CbQS3BAC4Zxp9GIim0lCCS5iiAq2Qvc fj4juVtYB84hxvDhnpesywE8QWZgY51i6LEJfPsQMom765Wggf4b06zxFB/aXqZfNe9bqTSK8Bo tB3X/bU+w6nXHHIJlWq/fEst8TnZph7jxT1lXP10FSWgbvgFXkAbMAvmq25BSvFH7xJZdRAXpNW Iq3EK3Y6q0pnCaZNaBmvQXplkYy2JSOk8qmJQqnX9e3O0ZmW31q7eeIjs70AJQcgQbRBKXVpKBu WBj6WH9iixpgktdKaxljB8Z1TadN6VaIjLROU76Nsnp+2VG+YD0cL3MntoW3UTTZJeIvf9IImFJ jIYX71Umg4Vj4dRO2SS9GUJwpZZBi7MUhpR6YxUvCyle2XHQIJP5Mn7PKKjrYcSW5dqfu2u9tu1 Y9Uig1bJmfFMZwU= X-Received: by 2002:a17:903:1aac:b0:2cf:af20:4254 with SMTP id d9443c01a7336-2d61a15e594mr181843635ad.10.1787315338494; Fri, 21 Aug 2026 05:28:58 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d62d554450sm18134515ad.2.2026.08.21.05.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 05:28:58 -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 1/3] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock Date: Fri, 21 Aug 2026 19:28:38 +0700 Message-ID: <20260821122840.41266-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260821122840.41266-1-phucduc.bui@gmail.com> References: <20260821122840.41266-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc The error paths in mt6797_afe_enable_clock() use incorrect goto labels, causing clocks that failed to enable to be disabled during cleanup. Fix the goto labels to only unwind clocks that were successfully enabled, and return the actual error code. Fixes: c5e7fca928d3 ("ASoC: mt6797: add structure define and clock control function for 6797") Reviewed-by: Cezary Rojewski Signed-off-by: bui duc phuc --- Changes in v2: - Update the subject prefix from ASoC: mt6797: to ASoC: mediatek: mt6797:. Changes in v3: - Add Fixes tags. - Add Reviewed-by tags. sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c index 6f3e6acfcfab..0ac04d73b777 100644 --- a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c +++ b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c @@ -63,21 +63,21 @@ int mt6797_afe_enable_clock(struct mtk_base_afe *afe) if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_INFRA_SYS_AUD], ret); - goto CLK_INFRA_SYS_AUDIO_ERR; + return ret; } ret = clk_prepare_enable(afe_priv->clk[CLK_INFRA_SYS_AUD_26M]); if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_INFRA_SYS_AUD_26M], ret); - goto CLK_INFRA_SYS_AUD_26M_ERR; + goto CLK_INFRA_SYS_AUDIO_ERR; } ret = clk_prepare_enable(afe_priv->clk[CLK_TOP_MUX_AUD]); if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD], ret); - goto CLK_MUX_AUDIO_ERR; + goto CLK_INFRA_SYS_AUD_26M_ERR; } ret = clk_set_parent(afe_priv->clk[CLK_TOP_MUX_AUD], @@ -93,13 +93,11 @@ int mt6797_afe_enable_clock(struct mtk_base_afe *afe) if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD_BUS], ret); - goto CLK_MUX_AUDIO_INTBUS_ERR; + goto CLK_MUX_AUDIO_ERR; } - return ret; + return 0; -CLK_MUX_AUDIO_INTBUS_ERR: - clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_BUS]); CLK_MUX_AUDIO_ERR: clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD]); CLK_INFRA_SYS_AUD_26M_ERR: @@ -107,7 +105,7 @@ int mt6797_afe_enable_clock(struct mtk_base_afe *afe) CLK_INFRA_SYS_AUDIO_ERR: clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUD]); - return 0; + return ret; } int mt6797_afe_disable_clock(struct mtk_base_afe *afe) -- 2.43.0