1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 06c7d1c67517..491bf2a1babd 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -971,11 +971,13 @@ 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 {
-                pr_err("No usable DMA config, aborting\n");
-                goto err_dma;
+                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;