diff options
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 59a62bbfb371..e34c2daac6a0 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -3326,19 +3326,14 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3326 | if (err) | 3326 | if (err) |
3327 | return err; | 3327 | return err; |
3328 | 3328 | ||
3329 | if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && | 3329 | if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) { |
3330 | !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { | ||
3331 | pci_using_dac = 1; | 3330 | pci_using_dac = 1; |
3332 | } else { | 3331 | } else { |
3333 | err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); | 3332 | err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
3334 | if (err) { | 3333 | if (err) { |
3335 | err = dma_set_coherent_mask(&pdev->dev, | 3334 | dev_err(&pdev->dev, "No usable DMA " |
3336 | DMA_BIT_MASK(32)); | 3335 | "configuration, aborting\n"); |
3337 | if (err) { | 3336 | goto err_dma; |
3338 | dev_err(&pdev->dev, "No usable DMA " | ||
3339 | "configuration, aborting\n"); | ||
3340 | goto err_dma; | ||
3341 | } | ||
3342 | } | 3337 | } |
3343 | pci_using_dac = 0; | 3338 | pci_using_dac = 0; |
3344 | } | 3339 | } |