aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgb
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-10 12:26:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-21 21:01:14 +0100
commitc21b8ebc2f1613fd0a9d5aa0d0d1083aee8ca306 (patch)
tree6061608ac67fff6645e48ada3baa07dbc110496d /drivers/net/ethernet/intel/ixgb
parentDMA-API: net: intel/igb: fix 32-bit DMA mask handling (diff)
downloadlinux-dev-c21b8ebc2f1613fd0a9d5aa0d0d1083aee8ca306.tar.xz
linux-dev-c21b8ebc2f1613fd0a9d5aa0d0d1083aee8ca306.zip
DMA-API: net: intel/igbvf: 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/ixgb')
0 files changed, 0 insertions, 0 deletions