From patchwork Sat Feb 20 09:41:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1442601 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=eTq+O7jf; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DjNkR46JRz9sVS for ; Sat, 20 Feb 2021 20:41:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7374F806C5; Sat, 20 Feb 2021 10:41:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="eTq+O7jf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8E7DD82483; Sat, 20 Feb 2021 10:41:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8FD1380404 for ; Sat, 20 Feb 2021 10:41:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1613814086; bh=03UKAmhswd/4cik90Nvmf4rEOeewDj3fNzO5/ECX6+I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=eTq+O7jfJAK3JS9e7uJf9RqBopWs4Ix0GXqv/OEG7+9oJrD2GH8fdNdItxrW1FnHU nt74GYuxd7sMJiIpCXo4xYIKezXPfOWfQALtIzwj8hFlPrJOeZpLLF0G+lZ6XZNkmz 3ZRK1rL0/R+nLtvAn39SQG3VQVees/l6j58+Cqzc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MbzuB-1lqa4H2fCJ-00dWiU; Sat, 20 Feb 2021 10:41:26 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] dm: error handling dev_get_dma_range() Date: Sat, 20 Feb 2021 10:41:22 +0100 Message-Id: <20210220094122.2981-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:unwy2WeAf9lPpZBWFpI1zIHvL5umZ9UgGqC/GjV1coh3en9B3Cu kKcbiRmAIcs5oUrY6PGcnC/kQGpd/aMXdjJxsAibaFkWVUNnSzMcYee1tr8QrYxQjWiCFV7 PYDczujnH197wJTEnfTSzDXjqlj0DoyPwtvmirmXexRTrHzpootp43E12NNEsJHP+VYS+NV mrJl+K1pO6L5FDkf6bZ+A== X-UI-Out-Filterresults: notjunk:1;V03:K0:nqQNDaeJpi8=:FWHKUlQ2yMRfAM9S9eTjvv xYYZM6dOA0rlRGRL2KSujaEMbOAB61LW9wCSPXOECTf1W9+m3TyrKwN7KkDJ7LvWVZ6R2HET9 h2jzf53gxHOpiQarZ29C9mc2KbGsMUd9cpQvWrYkOGg1/2MyX7vLn86zXePDqYR2mIpckrntw nQ0kDciZDd8M1dg2Yr5L2fckYMnly8xUC7M0i6blIv19iEuRdmJ6uCOJIsoQ/D2VZ20P/cS2F R+giTNI4CmW0htEWH9LYtt99dNhuCwvryuZux5/rfpo841wkBE6vZWZs1MfNFoXWXftCCwgfU +VzJB35sVbwYvTWXZTFC67L0d2B8bkLlk8HjwAAVRFS4aEKgTVPGKB9+Pzr64GT9xON2LJwMx JTF9vddv0qsKIREo4j20jrFEGdzVRHZesD9Itcf82ACagP7oksKTT3F+MpUMntUSR8mLL9Jqx HQG8kITRZ649jx58vnwpQh1cyLqs8ZTX/tc0K2d9wVMgbOsteBxClVkki0rIBps77Up91Olag FZCAeyLo21FClfAY/wwDJEhRiAt8NIGJha9SPtkgwZF8E+q2hvEFMezaVyvIOsgy1tIxlnsyB kTgYav6+clabJnUa6ZBcZVto28Cg0pF+lF9P5p0/8wkF81I6A0izxOo1cGt/FRRaFzxPLT/Yu GG3sSz0v/iNlUazwB691MAY3CJckca1nivdHdTfZ3EnGhSHvZGbwDSwp1wEUJWon7hTYEyRdX P/abVGkmJ9rrj0yCXF6R2KJIKPwp2/17cjJwlnVEyBTcqFuhtkbXG+OrB1EED/DtVKOEYUJZK kaJ3mWQ9YD8E/oHqb/771tQIVPKvWv4RO74SqXuLf9Ud2kKOr1dG8YDqlfx0lW85270uSzuVp opyq6p6zgdoUxGDxoi3w== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean goto after return has not effect. Calling of_node_put() in case of some errors and not for others is inconsistent. Fixes: 51bdb50904b ("dm: Introduce xxx_get_dma_range()") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- drivers/core/of_addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.0 diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c index 5bc6ca1de0..b3e384d2ee 100644 --- a/drivers/core/of_addr.c +++ b/drivers/core/of_addr.c @@ -372,7 +372,7 @@ int of_get_dma_range(const struct device_node *dev, phys_addr_t *cpu, bus_node->count_cells(dev, &na, &ns); if (!OF_CHECK_COUNTS(na, ns)) { printf("Bad cell count for %s\n", of_node_full_name(dev)); - return -EINVAL; + ret = -EINVAL; goto out_parent; } @@ -380,7 +380,7 @@ int of_get_dma_range(const struct device_node *dev, phys_addr_t *cpu, bus_node->count_cells(parent, &pna, &pns); if (!OF_CHECK_COUNTS(pna, pns)) { printf("Bad cell count for %s\n", of_node_full_name(parent)); - return -EINVAL; + ret = -EINVAL; goto out_parent; }