summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/rdc
diff options
context:
space:
mode:
authorRussell King2013-06-10 13:49:38 +0200
committerRussell King2013-09-21 22:01:40 +0200
commit53567aa4e00399aa59339bba81b285a5b95f425c (patch)
treef1dbc902507def656c6af0a6f3d941c475ea1193 /drivers/net/ethernet/rdc
parentDMA-API: net: intel/ixgbe: fix 32-bit DMA mask handling (diff)
downloadkernel-qcow2-linux-53567aa4e00399aa59339bba81b285a5b95f425c.tar.gz
kernel-qcow2-linux-53567aa4e00399aa59339bba81b285a5b95f425c.tar.xz
kernel-qcow2-linux-53567aa4e00399aa59339bba81b285a5b95f425c.zip
DMA-API: net: intel/ixgbevf: fix 32-bit DMA mask handling
The fallback to 32-bit DMA mask is rather odd: if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { 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; } } pci_using_dac = 0; } 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/rdc')
0 files changed, 0 insertions, 0 deletions