From patchwork Thu Feb 11 18:06:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1439606 X-Patchwork-Delegate: monstr@monstr.eu 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=1005vXyh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dc4MV0vDwz9sBJ for ; Fri, 12 Feb 2021 05:06:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1842782627; Thu, 11 Feb 2021 19:06:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="1005vXyh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5292C82540; Thu, 11 Feb 2021 19:06: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,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 49FBB82540 for ; Thu, 11 Feb 2021 19:06:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x52f.google.com with SMTP id s11so7923207edd.5 for ; Thu, 11 Feb 2021 10:06:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0Vs3ck/RUa77LQeRd/AQG9Ph0YZTI2oyPSSHo49KRes=; b=1005vXyhB7v1tVxBHm6SPyvXpnO3jEFAb85s7DdQdCdbs2LAPLi6tMRxMYUj/H5Ax9 wHWZOCOPfdsNS13RJKO34mCsmghGLrc0aS5eaxDaQh1sRGzrHEwmFGiaSW8aVUKWZWGx Rv6FK3up5/agePHyfYraU6sq8HAWExFFVedAoEejEzDHH00FmHmypSYLUEjIBNYL83bO OszV8+AgOSwXaKAo4TLfoG1GzLMvV1gWYJsLFDBe7RCCslu2YCk5vYy4JviNU9aboZVc iKPJlHxKjU5OiDvc+B6CH9ymtbuzro+6N/+nYYwEYE984wcv4hS6JTbT66xlYZks28GF 9inQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=0Vs3ck/RUa77LQeRd/AQG9Ph0YZTI2oyPSSHo49KRes=; b=qW5OXgmE9vwyNZB7SwRFcd3Xu0FyeGIkJgPujM3WHovj5typnhHsXWe8p00KlaJW8T SuSYmAvrycnrDMsOX3La7f+yafaKMZ2ZCCot34rMdbKmaWDHGqBYq1n8i/V6gZQ9eGZ/ pjJF6fUkOBEICgz8qgx7QljTreXpkOwVDJhIQZ9zCN6mY+6mjFmbPVd5tiFOj3jLov3n 1+pZaBQM7q0Lun0CAXw3zgjRoHY2HqUHqAjffnH9xhiwTvJfXDm5ozDFEbVKZSDRwWz1 36hCD4KEeAsMMTE37TPSZqg171Q+asVBAzdSuS63opex8rLGq0zOfhqqBT/USlWbBDcY y8xQ== X-Gm-Message-State: AOAM530/OLOyflJ2SBnInNR98L9qBtquKcJwsUSE+dGdhGnBxq1b+IYc 5hb85qeJdvLLTr+GtZ1pNvX8kUbWdwV04g== X-Google-Smtp-Source: ABdhPJzhdg32pQKg5TdCQ5R+MW5O8nraKFakCnQzzne98Q+Tr5FgLbFK/nWmMbkJa8HfvdGrFVQi8g== X-Received: by 2002:aa7:c396:: with SMTP id k22mr9606937edq.284.1613066786732; Thu, 11 Feb 2021 10:06:26 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id er1sm5131455ejc.69.2021.02.11.10.06.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Feb 2021 10:06:26 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Joe Hershberger , Ramon Fried Subject: [PATCH] net: gem: Fix error path in zynq_gem_probe Date: Thu, 11 Feb 2021 19:06:22 +0100 Message-Id: X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 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 Clean up error path in connection where priv->rxbuffers and priv->tx_bd are allocated. Signed-off-by: Michal Simek --- Based on https://lists.denx.de/pipermail/u-boot/2021-February/440943.html https://lists.denx.de/pipermail/u-boot/2021-February/441021.html --- drivers/net/zynq_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 9ed013ee5124..baf06a2ad897 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -708,14 +708,14 @@ static int zynq_gem_probe(struct udevice *dev) ret = clk_get_by_name(dev, "tx_clk", &priv->tx_clk); if (ret < 0) { dev_err(dev, "failed to get tx_clock\n"); - goto err1; + goto err2; } if (priv->clk_en_info & RXCLK_EN) { ret = clk_get_by_name(dev, "rx_clk", &priv->rx_clk); if (ret < 0) { dev_err(dev, "failed to get rx_clock\n"); - goto err1; + goto err2; } } @@ -737,9 +737,9 @@ static int zynq_gem_probe(struct udevice *dev) err3: mdio_unregister(priv->bus); err2: - free(priv->rxbuffers); -err1: free(priv->tx_bd); +err1: + free(priv->rxbuffers); return ret; }