From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 12:32:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'arm/for-next'
X-Git-Tag: next-20131024~114
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ff250e2c6670f14e35a1b6b18adbdaa55938a09a;p=karo-tx-linux.git

Merge remote-tracking branch 'arm/for-next'

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
---

ff250e2c6670f14e35a1b6b18adbdaa55938a09a
diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index b42f89ce02ef,38bf99893c1d..767aafb50406
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -12117,12 -12079,9 +12117,8 @@@ static int bnx2x_set_coherency_mask(str
  {
  	struct device *dev = &bp->pdev->dev;
  
- 	if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
- 		if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
- 			dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
- 			return -EIO;
- 		}
- 	} else if (dma_set_mask(dev, DMA_BIT_MASK(32)) != 0) {
 -	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) == 0) {
 -		bp->flags |= USING_DAC_FLAG;
 -	} else if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
++	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) != 0 &&
++	    dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
  		dev_err(dev, "System does not support DMA, aborting\n");
  		return -EIO;
  	}