Commit e3e3bfdd authored by Jean Sacren's avatar Jean Sacren Committed by Jeff Kirsher

i40e/i40evf: fix error checking path

The commit 6494294f ("i40e/i40evf: Use
dma_set_mask_and_coherent") uses dma_set_mask_and_coherent() to
replace dma_set_coherent_mask() for the benefit of return error.
The conversion brings some confusion in error checking as whether
against DMA_BIT_MASK(64) or DMA_BIT_MASK(32). For one, if error is
zero, the check will be against DMA_BIT_MASK(64) twice. Fix this
error checking by binding the check to the pertinent one.

Cc: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 21d3efdc
...@@ -8091,13 +8091,14 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -8091,13 +8091,14 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* set up for high or low dma */ /* set up for high or low dma */
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (err) if (err) {
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"DMA configuration failed: 0x%x\n", err); "DMA configuration failed: 0x%x\n", err);
goto err_dma; goto err_dma;
} }
}
/* set up pci connections */ /* set up pci connections */
err = pci_request_selected_regions(pdev, pci_select_bars(pdev, err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
......
...@@ -2191,13 +2191,14 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2191,13 +2191,14 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (err) if (err) {
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"DMA configuration failed: 0x%x\n", err); "DMA configuration failed: 0x%x\n", err);
goto err_dma; goto err_dma;
} }
}
err = pci_request_regions(pdev, i40evf_driver_name); err = pci_request_regions(pdev, i40evf_driver_name);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment