From 7f722136a98bd45d985c95814b271c0d9e8acd6c Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Tue, 29 May 2012 13:38:42 +0000 Subject: [PATCH] --- yaml --- r: 309491 b: refs/heads/master c: acaf8276823302983d681c2cedaaf01918406935 h: refs/heads/master i: 309489: 71b55ee703dfda5fc13e50ec25292d9b4d33466a 309487: ac08bac91ce66dddf85a96ae7facd2c2d2794d7c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/rdc/r6040.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9b62c1941a30..94544bcf364e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 617c8c11236716dcbda877e764b7bf37c6fd8063 +refs/heads/master: acaf8276823302983d681c2cedaaf01918406935 diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c index 4de73643fec6..f5e6f1f4f474 100644 --- a/trunk/drivers/net/ethernet/rdc/r6040.c +++ b/trunk/drivers/net/ethernet/rdc/r6040.c @@ -1096,20 +1096,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, if (err) { dev_err(&pdev->dev, "32-bit PCI DMA addresses" "not supported by the card\n"); - goto err_out; + goto err_out_disable_dev; } err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { dev_err(&pdev->dev, "32-bit PCI DMA addresses" "not supported by the card\n"); - goto err_out; + goto err_out_disable_dev; } /* IO Size check */ if (pci_resource_len(pdev, bar) < io_size) { dev_err(&pdev->dev, "Insufficient PCI resources, aborting\n"); err = -EIO; - goto err_out; + goto err_out_disable_dev; } pci_set_master(pdev); @@ -1117,7 +1117,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, dev = alloc_etherdev(sizeof(struct r6040_private)); if (!dev) { err = -ENOMEM; - goto err_out; + goto err_out_disable_dev; } SET_NETDEV_DEV(dev, &pdev->dev); lp = netdev_priv(dev); @@ -1238,6 +1238,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, pci_release_regions(pdev); err_out_free_dev: free_netdev(dev); +err_out_disable_dev: + pci_disable_device(pdev); err_out: return err; }