On Thu, 2013-09-19 at 22:27 +0100, Russell King wrote:

The fallback to 32-bit DMA mask is rather odd:
        err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
        if (!err) {
                err = dma_set_coherent_mask(&pdev->dev,
DMA_BIT_MASK(64));
                if (!err)
                        pci_using_dac = 1;
        } else {
                err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                if (err) {
                        err = dma_set_coherent_mask(&pdev->dev,
                                                    DMA_BIT_MASK(32));
                        if (err) {
                                dev_err(&pdev->dev,
                                        "No usable DMA configuration,
aborting\n");
                                goto err_dma;
                        }
                }
        }
This means we only set the coherent DMA mask in the fallback path if
the DMA mask set failed, which is silly.  This fixes it to set the
coherent DMA mask only if dma_set_mask() succeeded, and to error out
if either fails.

Signed-off-by: Russell King <redacted>
---
 drivers/net/ethernet/intel/e1000e/netdev.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

Acked-by: Jeff Kirsher <redacted>