From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 11 Sep 2024 10:24:40 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1soIeW-003QGS-1n for lore@lore.pengutronix.de; Wed, 11 Sep 2024 10:24:40 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1soIeV-0001U5-FW for lore@pengutronix.de; Wed, 11 Sep 2024 10:24:39 +0200 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=S0WuaVKDHdgzpcap/rt5812+MhXtFrOZOTSBvTDWrY0=; b=h2GgVBNQj+1U8B1p1M21tQU3O3 XbhwJs8QQYegNPcssTvLojqtYSRjBnAOQoib7TNwctV6bZmjlDWO9gYuGJ5f43hVTZAGNe/xJ4fM/ doIUcMheh8WRig2001pl5otrCR0g9hhGQr3ZKP42Gm3SSaYjHHk0jN87MSfviXPxoTe6kf9B2Edk0 ghaJ8gcLRZ7RwG8FRjrTC6JcqiWjAItVhn4vxw5c8wlDKqIZx0Y2DRKoxmm04qfkxJzn60QLH7m69 2telktiInd5iNGyJn8SdK9TD87r1RebRoxWQpmRnawKHqgBrgUaf3Vesc8YFNJGIkj7+GDJYWCvlW I+k4FX3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soIe0-00000008d36-3OkC; Wed, 11 Sep 2024 08:24:08 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1soIXu-00000008bIo-0GRG for barebox@lists.infradead.org; Wed, 11 Sep 2024 08:17:51 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1soIXs-0006nG-RW; Wed, 11 Sep 2024 10:17:48 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1soIXs-0075kU-Dn; Wed, 11 Sep 2024 10:17:48 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1soIXr-006Piu-2o; Wed, 11 Sep 2024 10:17:48 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 11 Sep 2024 10:17:47 +0200 Message-Id: <20240911081747.1523613-3-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240911081747.1523613-1-a.fatoum@pengutronix.de> References: <20240911081747.1523613-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240911_011750_130428_658965D4 X-CRM114-Status: GOOD ( 12.73 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 3/3] ARM: rpi: return correct error code when failing to read revision X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) When rpi_get_dcfg() returned an error, ret wasn't set and continued to hold the value of the hardware revision, which would be used as return value for the initcall. rpi_get_dcfg() already prints an error message with the HW revision when returning an error pointer, so passing along the extra error code results in no loss of information. Signed-off-by: Ahmad Fatoum --- arch/arm/boards/raspberry-pi/rpi-common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c index 7a3911e36fa1..754772da460f 100644 --- a/arch/arm/boards/raspberry-pi/rpi-common.c +++ b/arch/arm/boards/raspberry-pi/rpi-common.c @@ -552,8 +552,10 @@ static int rpi_devices_probe(struct device *dev) priv->hw_id = ret; dcfg = rpi_get_dcfg(priv); - if (IS_ERR(dcfg)) + if (IS_ERR(dcfg)) { + ret = PTR_ERR(dcfg); goto free_priv; + } /* construct short recognizable host name */ name = of_device_get_match_compatible(priv->dev); -- 2.39.2