summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-05-22 16:50:27 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-03 08:12:09 +0200
commit98770df2087a4466abf7008f5ab7c772f4ff7a92 (patch)
treea810dcd6fb8d5a3610957d52b56533c8168fc251 /drivers/net
parent702c510f89d7e44aa47f2ef4c945532c278bd8fc (diff)
net: sun: fix missing release regions in cas_init_one().
commit 5a730153984dd13f82ffae93d7170d76eba204e9 upstream. 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/sun/cassini.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 062bce9acde6..bfe7b55f9714 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -4980,7 +4980,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
@@ -5151,7 +5151,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.
*/