Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acaf8276 authored by Devendra Naga's avatar Devendra Naga Committed by David S. Miller
Browse files

r6040: disable pci device if the subsequent calls (after pci_enable_device) fails 



the calls after the pci_enable_device may fail, and will error out with out
disabling it. disable the device at error paths.

Signed-off-by: default avatarDevendra Naga <devendra.aaru@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 617c8c11

drivers/net/ethernet/rdc/r6040.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

}