summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-10 12:22:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-21 21:00:39 +0100
commit718a39eb587e038f7ded076afcfd8d709879139f (patch)
tree550ec0748859511163f58c313272893a94e99e1a /drivers/net/ethernet/intel/ixgbe
parent3e5480791e3b0e239d2cd4e5ecd43a7d2585484b (diff)
downloadblackbird-op-linux-718a39eb587e038f7ded076afcfd8d709879139f.tar.gz
blackbird-op-linux-718a39eb587e038f7ded076afcfd8d709879139f.zip
DMA-API: net: intel/e1000e: fix 32-bit DMA mask handling
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. Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud