1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 8cf44f2a8ccd..7579383c584d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2034,21 +2034,15 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return err;
 
         pci_using_dac = 0;
-        err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+        err = dma_set_mask_and_coherent(&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;
+                pci_using_dac = 1;
         } else {
-                err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+                err = dma_set_mask_and_coherent(&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;
-                        }
+                        dev_err(&pdev->dev,
+                                "No usable DMA configuration, aborting\n");
+                        goto err_dma;
                 }
         }