diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-10 12:16:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-09-17 15:32:38 +0100 |
| commit | 3e5480791e3b0e239d2cd4e5ecd43a7d2585484b (patch) | |
| tree | b7357da0c59892bba369ad27fb46716b8a9f5671 /drivers/net/ethernet/intel | |
| parent | 4aa806b771d16b810771d86ce23c4c3160888db3 (diff) | |
| download | blackbird-op-linux-3e5480791e3b0e239d2cd4e5ecd43a7d2585484b.tar.gz blackbird-op-linux-3e5480791e3b0e239d2cd4e5ecd43a7d2585484b.zip | |
DMA-API: net: brocade/bna/bnad.c: 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))) {
*using_dac = true;
} 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)
goto release_regions;
}
This means we only try and set the coherent DMA mask if we failed to
set a 32-bit DMA mask, and only if both fail do we fail the driver.
Adjust this so that if either setting fails, we fail the driver - and
thereby end up properly setting both the DMA mask and the coherent
DMA mask in the fallback case.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/ethernet/intel')
0 files changed, 0 insertions, 0 deletions
