Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2cd94c8a1b4184b48ecbc16b353dcbb513053285

Authored by Mark Brown
Committed by Grant Likely
1 parent c88dd349b5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

spi: Ensure memory used for spi_write_then_read() is DMA safe 

Use GFP_DMA in order to ensure that the memory we allocate for transfers
in spi_write_then_read() can be DMAed. On most platforms this will have
no effect.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -1661,7 +1661,8 @@
1661 1661 * using the pre-allocated buffer or the transfer is too large.
1662 1662 */
1663 1663 if ((n_tx + n_rx) > SPI_BUFSIZ || !mutex_trylock(&lock)) {
1664   - local_buf = kmalloc(max((unsigned)SPI_BUFSIZ, n_tx + n_rx), GFP_KERNEL);
  1664 + local_buf = kmalloc(max((unsigned)SPI_BUFSIZ, n_tx + n_rx),
  1665 + GFP_KERNEL | GFP_DMA);
1665 1666 if (!local_buf)
1666 1667 return -ENOMEM;
1667 1668 } else {