From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 5FB7D36B061 for ; Tue, 18 Aug 2026 10:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787049851; cv=none; b=p4mD2wTmgaGM/Msojk7D8sQqPvxFIZZjJF0xHkLODdDp/nSs47ezGi7KV+xtGsmtCx8H80278S9eAwp0gky0oEU0V2G/h4l1Nt7HHeRxFiYl8aDEkQfzvY9W6v2EGyD0Sl55JMfK8MERm/Zsk1G+B9Cq/VVbrspQzIojfEUNpx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787049851; c=relaxed/simple; bh=oeDHkKNNNIRwev9sixTsLe6A3+49u8x6Z6Oy4T6Z0b0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=a1vJo90v8dcsnZ/8DxUaSheoG4FiXAcoXhi7gC5Hki425J3+tc4mMcfBd1ZCBxEX0d0HzPcwCka955x3mN8/rysdnksGLmxWkBUp/BlC8s8v8uEU16UicuooMOWX6xOV9Fy8Oz02E0DAHgB259OF8S94HO8gwNdwVlU0BnWHEyI= 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=dB/djWKK; arc=none smtp.client-ip=209.85.214.171 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="dB/djWKK" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2d049069377so45893195ad.0 for ; Tue, 18 Aug 2026 03:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787049850; x=1787654650; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Mu6cEuUuRvNS2qVienJZZQ/34Pa6SULcthRHhbJplqA=; b=dB/djWKKDguRNezX/R1NiWChyI2XshAzAj9lawFawLm0XqxR9t785IUp4ehwAmX1XZ FY9LVG7dLMfGMuhOAhaFeIa4NER74K+d092Qv3cepn7l0nfpwqHlorm0uHcQU7pnfbTg EUJ64v1N0q+1ZLAfnmqGr0dITSVMql6Bvo/vSt6vFADs0wywRzMSfL3/trTlbHfQm7Th PIvQ4ONVVJl58qlpJKJ4HvzF09cV4/EvTlWiN7e0WexT0QDL+C/yVxsp8nb9RMAHlcLm zE++u4jPUfTgxHUB/6Jhv2xKRG9uuItOTmYfLTxVPNsInHu9MBSWV2rIo3ISXgIWi7DM lTuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787049850; x=1787654650; h=content-transfer-encoding:mime-version: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=Mu6cEuUuRvNS2qVienJZZQ/34Pa6SULcthRHhbJplqA=; b=m5mbc/iwERc5rMpUyF+3ftTasJfYIf0B3T8CwsltrRbjjEk9s0oHBsHRE5Ag9rnHD8 FHrLaMSilu8F8mSFCY5gvWIrw5kP1697DY1igS95NnFxPMPbygwBxU7dBRKbD1aevcUY Oo2v1ALnpqAAe0iNHK0ou9iQz8n3S3iE6oyZ2Ykj4sNG+y3bWFxdPBKIAovHllmXI3mJ vB7H/wkYideTUQa1qvYx+0+M9rRBtUpYhK20y0J1b8MoTlEKrdxaSp/lIoOiJmUFtMDn sJhRLvLeSGpBoWH5sNnIlIBtO5QOezcxTq4gN2c2/K9H/e1LZKILE19Fr/LSKL8WpaSP 6bcw== X-Forwarded-Encrypted: i=1; AHgh+Rrq3R5C33QkyKqWo6NwCB43VB/c2Mx+mJPIrr2acoRjU8346LTOx7vv5fDxJQ45XAvMURzJ5Lhq6wAIEvM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1WA0Sag/8mIOZCLpbcnU40eYXCkfJH51ozOX6hOXQVVh8SaLZ tJSycvWUNaTBMfFLXvJXojKAZUb2YNEE4jEivAD6jX5Oa370Cd03EADZ X-Gm-Gg: AR+sD138z344WMCSjPyrr0x7ksQhHM3ddSf5ttUxoF4w60MpIapbJhsJWrRKxTuviid 0s04CY/bhfGUDDZHMrukbKAF3Vd3mT9k1JSagSqmxByvqkPmHm/IjuAtiSvNAtvxZp4ficSfKvG yY7n8NS0NqYY/eWh9ogGi7N3jRawSaY6DAhJ9Wj1sgouOZvcOYqgECsTRBwhUWWy9ZiWnZeyoWI clpDbhY8GQXLeViAyx96UjYVl6QDkaTRSkOmqcSFVBAfDqELSdyDc1kFCifOPpc0VfHyaetuAu7 BTIHj3QJg4mMwGWumcNvt5rDdvsY0PQ8Khy+WY5NmAXS1iMKR2skHQGQ6vjuHkfQNKe5jxqhjHg /JLNPSY1z3KSfGhhTnQhgwVNzwW5gE/KfryAiUUNIcjc5gjabKmKY1q03VyNWYKiCqrZKHp7IB1 tTc1GlYl0oBJKhOzoiW1y12FTpLId1I55SKg6FPgJVeNL2SfnGtwhK4+xc184IqLeEJYbC2sxtq BIyT9k2D1qFhnFxtnYT63HiFL8IHHq/rmFnADBtbHwtjUCyXLhh+p4ohAyi5EbDOaPh6aC14U+y K0o5 X-Received: by 2002:a17:903:1850:b0:2ca:f21a:a6c5 with SMTP id d9443c01a7336-2d3b0aeeb01mr407552145ad.1.1787049849560; Tue, 18 Aug 2026 03:44:09 -0700 (PDT) Received: from phuc-desktop.. ([14.160.25.72]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3267bf83fb2sm15039905eec.19.2026.08.18.03.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 03:44:09 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Matthias Brugger Cc: Liam Girdwood , AngeloGioacchino Del Regno , Jaroslav Kysela , Takashi Iwai , 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 1/3] ASoC: mediatek: mt8173: Fix clock error handling Date: Tue, 18 Aug 2026 17:43:42 +0700 Message-ID: <20260818104344.37824-1-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 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 handling paths in mt8173_afe_runtime_resume() use incorrect labels, specifically err_i2s1_m and err_i2s2_m. When clk_prepare_enable() fails, the code jumps to a label that calls clk_disable_unprepare() on the clock that failed to enable. Instead, it should call clk_disable_unprepare() on the clock that was successfully enabled before the failure. Fix the labels and clk_disable_unprepare() calls to ensure the error cleanup is handled correctly. Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c index 69cadc91c97f..b4c6ef6f0845 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -997,10 +997,10 @@ static int mt8173_afe_runtime_resume(struct device *dev) goto err_bck0; ret = clk_prepare_enable(afe_priv->clocks[MT8173_CLK_I2S1_M]); if (ret) - goto err_i2s1_m; + goto err_bck1; ret = clk_prepare_enable(afe_priv->clocks[MT8173_CLK_I2S2_M]); if (ret) - goto err_i2s2_m; + goto err_i2s1_m; /* enable AFE clk */ regmap_update_bits(afe->regmap, AUDIO_TOP_CON0, AUD_TCON0_PDN_AFE, 0); @@ -1018,8 +1018,8 @@ static int mt8173_afe_runtime_resume(struct device *dev) err_i2s1_m: clk_disable_unprepare(afe_priv->clocks[MT8173_CLK_I2S1_M]); -err_i2s2_m: - clk_disable_unprepare(afe_priv->clocks[MT8173_CLK_I2S2_M]); +err_bck1: + clk_disable_unprepare(afe_priv->clocks[MT8173_CLK_BCK1]); err_bck0: clk_disable_unprepare(afe_priv->clocks[MT8173_CLK_BCK0]); err_top_aud: -- 2.43.0