Commit 19a0b67a authored Nov 11, 2010 by Dean Nelson Committed by Jeff Kirsher Dec 10, 2010

e1000: fix return value not set on error



Dean noticed that 'err' wasn't being set when the "goto err_dma"
statement is executed in the following hunk from the commit. It's value
will be zero as a result of a successful call to e1000_init_hw_struct().

This patch changes the error condition to be correctly propagated.

CC: stable@kernel.org
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent fa795e6b

drivers/net/e1000/e1000_main.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -971,12 +971,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
		*/
		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
		pci_using_dac = 1;
		} else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
		} else {
		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (err) {
		pr_err("No usable DMA config, aborting\n");
		goto err_dma;
		}
		dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
		}

		netdev->netdev_ops = &e1000_netdev_ops;
		e1000_set_ethtool_ops(netdev);