Skip to contentSkip to conversation

via-rhine: Disable device in error path

PATCH Applied Roger Luethi 2 participants 2 messages Mar 18, 2014 – Mar 19, 2014

Subsystems (3)
Networking Network drivers Via rhine network driver
lore
Share & tools
lore

Roger Luethi

author
#0 lore raw

PATCH 1/1 via-rhine: Disable device in error path

Currently, via-rhine fails to call pci_disable_device() for errors in rhine_init_one().

Reported-by Huqiu Liu <[email protected]>
Signed-off-by Roger Luethi <[email protected]>
---
 drivers/net/ethernet/via/via-rhine.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/via/via-rhine.c +5 -3
index ef312bc..6ac20a6 100644
@@ -923,7 +923,7 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (rc) {
 		dev_err(&pdev->dev,
 			"32-bit PCI DMA addresses not supported by the card!?\n");
-		goto err_out;
+		goto err_out_pci_disable;
 	}
 
 	/* sanity check */

@@ -931,7 +931,7 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	    (pci_resource_len(pdev, 1) < io_size)) {
 		rc = -EIO;
 		dev_err(&pdev->dev, "Insufficient PCI resources, aborting\n");
-		goto err_out;
+		goto err_out_pci_disable;
 	}
 
 	pioaddr = pci_resource_start(pdev, 0);

@@ -942,7 +942,7 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	dev = alloc_etherdev(sizeof(struct rhine_private));
 	if (!dev) {
 		rc = -ENOMEM;
-		goto err_out;
+		goto err_out_pci_disable;
 	}
 	SET_NETDEV_DEV(dev, &pdev->dev);
 

@@ -1084,6 +1084,8 @@ err_out_free_res:
 	pci_release_regions(pdev);
 err_out_free_netdev:
 	free_netdev(dev);
+err_out_pci_disable:
+	pci_disable_device(pdev);
 err_out:
 	return rc;
 }
Signature · 1 line
1.7.10.4