From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 09 Jan 2024 17:16:58 +0100 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 1rNEmg-00AUFi-1f for lore@lore.pengutronix.de; Tue, 09 Jan 2024 17:16:58 +0100 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 1rNEmf-0000Kq-CW for lore@pengutronix.de; Tue, 09 Jan 2024 17:16:58 +0100 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:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cDJUr95B4Gou7+GfEWSfZzjHLlq3d2Hg+kBZCM9SPQE=; b=G/FQN1RYW8X9KJ+pJmAcZ1xp/e SCYHxiAWH48WrilVcRiut+mut66V3mTB2H0j+93pZwih/U14DZIHGZnmnEtzmqnUyBFumltQ2qSGQ 9ZhS9A0OZ6uphiP1gY2qC1bZWkGCwFShVI/1n5V/7zp912F+bfqLKAKU1P3lvTSmYL+rSF2vuIyUp WmZNOB+ckiOlDSzL/kKiUI1RVDUCvSDNyyoKpSJKnyqmnw3X6NPFZ23LD0DS2ogP+BNB7NrcOud4c R6gnyWr8Q1ojycvIdIA9XEJT8GihGnM9C1mNxsIfqCG5yCvVPmzvN0cF3MANoUTXimvsm7vKcT3Dx 6CJJusIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rNElO-008nni-37; Tue, 09 Jan 2024 16:15:39 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rNElJ-008nim-2B for barebox@lists.infradead.org; Tue, 09 Jan 2024 16:15:35 +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 1rNElF-0007l3-0m; Tue, 09 Jan 2024 17:15:29 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.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 1rNElE-001WCJ-F7; Tue, 09 Jan 2024 17:15:28 +0100 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rNElE-00E7P8-1I; Tue, 09 Jan 2024 17:15:28 +0100 From: Sascha Hauer To: Barebox List Date: Tue, 9 Jan 2024 17:15:07 +0100 Message-Id: <20240109161527.3237581-2-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240109161527.3237581-1-s.hauer@pengutronix.de> References: <20240109161527.3237581-1-s.hauer@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-20240109_081533_732500_A2AA1627 X-CRM114-Status: GOOD ( 12.62 ) 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=-6.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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 01/21] memory: Fix reserve_sdram_region() return value 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) __request_sdram_region() returns NULL on failure, so test for this value and not for an error pointer. Also all callers of reserve_sdram_region() expect NULL on failure, so return that value in case of failure. Signed-off-by: Sascha Hauer --- common/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/memory.c b/common/memory.c index 300320f853..583843cc34 100644 --- a/common/memory.c +++ b/common/memory.c @@ -229,8 +229,8 @@ struct resource *reserve_sdram_region(const char *name, resource_size_t start, } res = __request_sdram_region(name, IORESOURCE_BUSY, start, size); - if (IS_ERR(res)) - return ERR_CAST(res); + if (!res) + return NULL; remap_range((void *)start, size, MAP_UNCACHED); -- 2.39.2