From: Tom Rini <trini@konsulko.com>
Date: Tue, 28 Oct 2025 19:24:44 +0000 (-0600)
Subject: Revert "clk: Return value calculated by ERR_PTR"
X-Git-Tag: v2026.01-rc2~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed8fafbcde3425d8817ec5953edd428c7508153;p=thirdparty%2Fu-boot.git

Revert "clk: Return value calculated by ERR_PTR"

This reverts commit 644b4650ee57c429bede77f44752cc867dac0e00.

While the intention of the above commit is correct, it leads to test
failures in CI that need to be addressed at the same time.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index dc01f612ba6..3dbe1ce9441 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -199,7 +199,7 @@ static struct clk *clk_set_default_get_by_id(struct clk *clk)
 		if (ret) {
 			debug("%s(): could not get parent clock pointer, id %lu\n",
 			      __func__, clk->id);
-			return ERR_PTR(ret);
+			ERR_PTR(ret);
 		}
 	}