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 6D708C88E50 for ; Mon, 14 Sep 2026 07:29:42 +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=vZhy1gvzxv4nnqK22Id8tWzLP/pMb4kmGE3X33hanlU=; b=wTy1jQgOfVt8NWVGmx6rjRNNxu toFvH6yB/RCdrN6Kty7w50chfFC7vKEF8qripZWQBxq7C01nGBC68NFE74c/jRZrAiG+dvX/O/NhP zsV4UAvR6G4ZX5RBF0rx8oopetrEcsKWZrGiTF2xGER9WcRYRTQ/xtLd9bXR76m1wYAVYBF9JCVEj fr5XMNIBEcU+E3OBHsUm9jYuz2utaQsTTl2RyZeV19Wv85BOtyijJ5qk4GqgY30CkMi1YmIjT/pEm m0ew+Car1UweiryPQash9i6zKiyHhXGAiztjz4gNztT6HmEzOqn2NUmkiB85PTxdTKvYa1eldFTLg Ax5+IgAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x618H-00000002Yfj-1ZSQ; Mon, 14 Sep 2026 07:29:41 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x6185-00000002YRw-09nm for linux-mediatek@lists.infradead.org; Mon, 14 Sep 2026 07:29:31 +0000 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-cc4aa02a269so2282663a12.2 for ; Mon, 14 Sep 2026 00:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789370968; x=1789975768; 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=vZhy1gvzxv4nnqK22Id8tWzLP/pMb4kmGE3X33hanlU=; b=qmRk0BZ4OpJQ8eDW4zgg08MUgxDUOkaHVHYzl2PcglCSOHXvCDtTWRWiQWhbNIGncY lmgA9mxQjOp2P3zVBrlIow8dWeOs+UKlGZRWDBDEeU5IyZ9iOLyzhqn+NfOriQulP2aa M6Ik4q60vq8IqE9nOzjIvivBf7DFJVGVwgX97BzzKoi4fL233L3+priWDOezQDIlCAik RHS6CirEqc6DffD//g2Ct7To5rVnYcGRE3dtVgifN9kw92OvEMKz+xMHCODAfL3QgFNB CXKrI5ScW1mIMW5YWxQaGi/GIhXzXYejrtlq2/xQ1DdUyG5Ol3K46KrUPhVTD1K5ATui WnJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789370968; x=1789975768; 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=vZhy1gvzxv4nnqK22Id8tWzLP/pMb4kmGE3X33hanlU=; b=YnEAt57Vc68IIcHEY+thvfEuhyxzFQe+zmhmVtM1XH2kag+qv1Hvn7WYsmeBSgRz4x yI9urt+XuBGJ+ENXWplr8QRMXilaGH5fVcDsAAL7YpLziglhugBaipWa9YzfWGGz5XjY //OuDhk3haHqzTtfPEV5+z5N1bKZLAqNPngTzVHn7BzhEmAYlbr83SEy2zxXV9uYA7E5 UgTNMV4SPXyXKtGz94sIb3W3+SE61nwlmDegEm+5y+lr6P0voofZC6kHNq5kyrF+HUIB xDwHLJWTM1rwDb7QnU1pBwxB/u9DUQ8xBPbGjctEIlvIsgyzR26FeAqWwlPSpEel3/bU 6eGA== X-Forwarded-Encrypted: i=1; AKwUvBxWrTQ/vWiz3EcOnne4RZEHfoSkvYJuE9Y2KhV3NTr/dgrktm5Imt5Y0K1v3S9VgL7ulV+Fp7YkObqWlX6LSg==@lists.infradead.org X-Gm-Message-State: AFuF++lsnxWsTuJ/6ohO30OL6yGiKmqYup0y2DKdOHcut+GeFJwUZQrs Dctm+ADSnGpP72MVq1NQFeAdnwBeqaqdG6SLBE2ed7tqwIY1f8vXtehW X-Gm-Gg: AYBFou3FO++xMN4RHJs9oaPje2AwCnwqdnUoQhGUqrYkhUZDMZo6C370qN+c6AV85a7 rcfKN4ll3ZsnVRgvecVjEsZoOCBIccd4l1e5ZDBqd3kOW1+MBA8Wa/0wqNzyMcnhD86G081DU9j 1r6DVUWhkdb7tXSj2g6ey6jKIE+o/JGC4Ojl6R4hSKzXVoBb00BFDiuQqPWKX+2U7fmGtBlUISS +HebrVAH5re+IZ3wV2m2maICWnmHrOtvK08sJCBveyPKfi5PjBBf9baZt23LmZmzCzQpgsDF9Fp ucR4xRFdwID+PztmzhWGO/faw0LBRiku+Dh638jex4NooJXDZZd6Lhvil0NaDst7lQGtTNxB7iW Z0I7e/zTkfLoGvtFRamQE0F4G50HIinLgyDZEE1KWeajkZ1P0J34DD7Rsksfu9wAkeLfjqapJH+ g08z38Yjg7RLVELgQK64o1kRVsI4tSFC1n11x94X2ex+k8zuSS8vWUpq0W4XNwyBE76SBY8+h5j 5wVQ2pRhL6aAY1rLGRrNfC8y7cVYXEow1yqDQtRvblytvUTLlzvgIDbMEh8NJfnb+qJDoVSmEq3 l61IsQd6Jq5hVI4= X-Received: by 2002:a17:90a:d008:b0:39d:f5b1:e35f with SMTP id 98e67ed59e1d1-39df5b1e456mr82384a91.25.1789370968111; Mon, 14 Sep 2026 00:29:28 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39d957131f9sm19598245a91.12.2026.09.14.00.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 00:29:27 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno Cc: Liam Girdwood , Matthias Brugger , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , Cyril Chao , Kuninori Morimoto , Dan Carpenter , cassiogabrielcontato@gmail.com, 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 v2 07/13] ASoC: mediatek: mt8189: Propagate runtime resume errors Date: Mon, 14 Sep 2026 14:28:36 +0700 Message-ID: <20260914072842.24420-8-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260914072842.24420-1-phucduc.bui@gmail.com> References: <20260914072842.24420-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-20260914_002929_072663_1CDF4790 X-CRM114-Status: GOOD ( 11.05 ) 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 mt8189_afe_runtime_resume() currently ignores errors from regmap operations and mt8189_afe_enable_main_clock(). Propagate these errors and clean up the state before returning the error. Fixes: 7eb153585598 ("ASoC: mediatek: mt8189: add platform driver") Signed-off-by: bui duc phuc --- Changes in v2: - Update the names of the goto labels. sound/soc/mediatek/mt8189/mt8189-afe-pcm.c | 36 +++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/sound/soc/mediatek/mt8189/mt8189-afe-pcm.c b/sound/soc/mediatek/mt8189/mt8189-afe-pcm.c index 77cf2b604f6c..67fa40afdefa 100644 --- a/sound/soc/mediatek/mt8189/mt8189-afe-pcm.c +++ b/sound/soc/mediatek/mt8189/mt8189-afe-pcm.c @@ -2328,24 +2328,46 @@ static int mt8189_afe_runtime_resume(struct device *dev) if (!afe->regmap) { dev_warn(afe->dev, "skip regmap\n"); - return 0; + ret = -EINVAL; + goto err_disable_reg_rw_clk; } regcache_cache_only(afe->regmap, false); - regcache_sync(afe->regmap); + ret = regcache_sync(afe->regmap); + if (ret) + goto err_set_cache_only; /* set audio 26M request */ - regmap_update_bits(afe->regmap, AFE_SPM_CONTROL_REQ, 0x1, 0x1); - regmap_update_bits(afe->regmap, AFE_CBIP_CFG0, 0x1, 0x1); + ret = regmap_update_bits(afe->regmap, AFE_SPM_CONTROL_REQ, 0x1, 0x1); + if (ret) + goto err_set_cache_only; + + ret = regmap_update_bits(afe->regmap, AFE_CBIP_CFG0, 0x1, 0x1); + if (ret) + goto err_clear_26m_req; /* force cpu use 8_24 format when writing 32bit data */ - regmap_update_bits(afe->regmap, AFE_MEMIF_CON0, - CPU_HD_ALIGN_MASK_SFT, 0 << CPU_HD_ALIGN_SFT); + ret = regmap_update_bits(afe->regmap, AFE_MEMIF_CON0, + CPU_HD_ALIGN_MASK_SFT, 0 << CPU_HD_ALIGN_SFT); + if (ret) + goto err_clear_26m_req; /* enable AFE */ - mt8189_afe_enable_main_clock(afe); + ret = mt8189_afe_enable_main_clock(afe); + if (ret) + goto err_clear_26m_req; return 0; + +err_clear_26m_req: + regmap_update_bits(afe->regmap, + AFE_SPM_CONTROL_REQ, 0x1, 0x0); +err_set_cache_only: + regcache_cache_only(afe->regmap, true); +err_disable_reg_rw_clk: + mt8189_afe_disable_reg_rw_clk(afe); + + return ret; } static int mt8189_afe_component_probe(struct snd_soc_component *component) -- 2.43.0