From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7226606A31C for ; Tue, 17 Nov 2026 23:51:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=4QclS+L6; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.a=rsa-sha256 header.s=gloria202408 header.b=eT1U28Xf 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-Unsubscribe-Post: List-Owner; bh=0oMXGLoKcrMltsWL6uMm4zEKFcls2YExOE/JJ6JogwE=; b=4QclS+L6CJ6BfB OeWNCSVDNGWZ6/3EAO8Pt3E/bdqBhMGJDU4t+0YUvtK9/kwge5n+Eq2WqhYrT5uAzpoBfUJkRCGsV w5Z1fqMT4BnbvqW0cSKmWtOOMH6ibu0KARp+RDQKeoRfd4IWyuv/44DxOCjMVw8TN3JosRiaQcTXs geVwwiVHkw/2mdHy+4Vl2ODkxU2qFxnF01isjRG9v7J6nL69DHu50S1L+f6FkWvKG42Rmngf+6CKY HwVNP2i/SRwS39M7SuhVIA+QWhS1rxJC7oRy2fZ/vatV60Jga1usA2R6qX5db7Yo4URE6jI399aiL 7wNmsJeI58bABLipfS7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTSwr-00000007JOV-2ZtX; Tue, 17 Nov 2026 23:50:49 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTSwp-00000007JMn-33Jh; Tue, 17 Nov 2026 23:50:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type; bh=0oMXGLoKcrMltsWL6uMm4zEKFcls2YExOE/JJ6JogwE=; b=eT1U28XfPrgX2Cuu1cq1A6eUiK QA0pCfbnSuaUZiaToiyC1gdOP0SlmE++zEY3IIQ8MPh3CRtQ2q45w6SsdvR45G4S4WtzJ6ty/hNnS 6B+irPbVY+3elZXp0vxsv8QV04QFMN9ZgNpuqhl4aA/Q3XrgP/aSKMBPkv3UMR0tqs6Ld0xad+jZW ROBdlEqaCtI720fZEYd5ey3bjjBmHiCgsxhoHxplIkcv+a8xOIpaci3U1IhuRvwD8feABbnI4WE4Y 2FvLzxnQ3Ta8vzM4BY61ioMLlkKMJqVcP7kOfMebEV/utvOkxdBQ/etF3m0mQKmI2K6eU7FXZEJH0 vYQAAPKQ==; From: Heiko Stuebner To: broonie@kernel.org Cc: Heiko Stuebner , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, quentin.schulz@cherry.de, Lee Jones , Sebastian Reichel , Heiko Stuebner Subject: [PATCH v3 5/7] spi: rockchip: Fix runtime resume error handling Date: Wed, 18 Nov 2026 00:50:19 +0100 Message-ID: <20261117235021.2013719-6-heiko@sntech.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117235021.2013719-1-heiko@sntech.de> References: <20261117235021.2013719-1-heiko@sntech.de> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261117_155047_771725_7A3B3770 X-CRM114-Status: GOOD ( 14.26 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 From: Heiko Stuebner When enabling the apb-clock any error does get handled, but when an error happens enabling the spiclk itself, only the apb-clock is disabled but the function then returns successful. Fix this by also reporting the error on enabling the second clock. Signed-off-by: Heiko Stuebner --- drivers/spi/spi-rockchip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 1a81fd94b439..8bb55d52d346 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -994,8 +994,10 @@ static int rockchip_spi_runtime_resume(struct device *dev) return ret; ret = clk_prepare_enable(rs->spiclk); - if (ret < 0) + if (ret < 0) { clk_disable_unprepare(rs->apb_pclk); + return ret; + } return 0; } -- 2.53.0