netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Qiushi Wu <wu000273@umn.edu>,
	"David S . Miller" <davem@davemloft.net>,
	Sasha Levin <sashal@kernel.org>,
	netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 18/26] net: sun: fix missing release regions in cas_init_one().
Date: Thu, 28 May 2020 07:56:46 -0400	[thread overview]
Message-ID: <20200528115654.1406165-18-sashal@kernel.org> (raw)
In-Reply-To: <20200528115654.1406165-1-sashal@kernel.org>

From: Qiushi Wu <wu000273@umn.edu>

[ Upstream commit 5a730153984dd13f82ffae93d7170d76eba204e9 ]

In cas_init_one(), "pdev" is requested by "pci_request_regions", but it
was not released after a call of the function “pci_write_config_byte”
failed. Thus replace the jump target “err_write_cacheline” by
"err_out_free_res".

Fixes: 1f26dac32057 ("[NET]: Add Sun Cassini driver.")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/sun/cassini.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index c91876f8c536..6e78a33aa5e4 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -4971,7 +4971,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 					  cas_cacheline_size)) {
 			dev_err(&pdev->dev, "Could not set PCI cache "
 			       "line size\n");
-			goto err_write_cacheline;
+			goto err_out_free_res;
 		}
 	}
 #endif
@@ -5144,7 +5144,6 @@ err_out_iounmap:
 err_out_free_res:
 	pci_release_regions(pdev);
 
-err_write_cacheline:
 	/* Try to restore it in case the error occurred after we
 	 * set it.
 	 */
-- 
2.25.1


  parent reply	other threads:[~2020-05-28 12:04 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200528115654.1406165-1-sashal@kernel.org>
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 07/26] net sched: fix reporting the first-time use timestamp Sasha Levin
2020-05-31 21:19   ` Pavel Machek
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 09/26] net: bmac: Fix read of MAC address from ROM Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 10/26] r8152: support additional Microsoft Surface Ethernet Adapter variant Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 14/26] net: mvpp2: fix RX hashing for non-10G ports Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 15/26] net/ethernet/freescale: rework quiesce/activate for ucc_geth Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 16/26] net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x Sasha Levin
2020-05-28 11:56 ` Sasha Levin [this message]
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 19/26] net/mlx5: Add command entry handling completion Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 20/26] net/mlx5e: Fix inner tirs handling Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 21/26] net/mlx5: Fix memory leak in mlx5_events_init Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 22/26] net/mlx5e: Update netdev txq on completions during closure Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 23/26] net/mlx5: Fix error flow in case of function_setup failure Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 24/26] net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 25/26] net/mlx4_core: fix a memory leak bug Sasha Levin
2020-05-28 11:56 ` [PATCH AUTOSEL 5.4 26/26] net: smsc911x: Fix runtime PM imbalance on error Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200528115654.1406165-18-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=wu000273@umn.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).