From: Mark Brown <broonie@kernel.org>
Date: Wed, 20 Feb 2019 17:58:18 +0000 (+0000)
Subject: Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.1-rc1~181^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf9f742c38c4604a8ee349f7baefca58b3a5ff67;p=thirdparty%2Flinux.git

Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.1
---

bf9f742c38c4604a8ee349f7baefca58b3a5ff67
diff --cc drivers/spi/spi-pxa2xx.c
index 69e874a2ad1e4,3e82eaad0f2d9..b6ddba833d021
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@@ -1695,7 -1695,8 +1695,8 @@@ static int pxa2xx_spi_probe(struct plat
  			dev_dbg(dev, "no DMA channels available, using PIO\n");
  			platform_info->enable_dma = false;
  		} else {
 -			master->can_dma = pxa2xx_spi_can_dma;
 -			master->max_dma_len = MAX_DMA_LEN;
 +			controller->can_dma = pxa2xx_spi_can_dma;
++			controller->max_dma_len = MAX_DMA_LEN;
  		}
  	}