• Russell King's avatar
    DMA-API: net: intel/e1000e: fix 32-bit DMA mask handling · 718a39eb
    Russell King authored
    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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
    718a39eb
netdev.c 198 KB