From f5ae2254c492df112241e7602ab5c505a32cc1bf Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 27 Jan 2013 14:35:04 +0800
Subject: [PATCH] --- yaml --- r: 350779 b: refs/heads/master c:
 2cd94c8a1b4184b48ecbc16b353dcbb513053285 h: refs/heads/master i:   350777:
 fe9cfcefedd34857f2b693dffd2ef0f08c13afcd   350775:
 296046cbd7482da3e3f784ef41c05da721406167 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/spi/spi.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b0e7ded839ce..1a88abe71dfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c88dd349b5a83c9efa4030176a5184a9a1440475
+refs/heads/master: 2cd94c8a1b4184b48ecbc16b353dcbb513053285
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 2edbe1903804..d1e0a316826d 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -1661,7 +1661,8 @@ int spi_write_then_read(struct spi_device *spi,
 	 * using the pre-allocated buffer or the transfer is too large.
 	 */
 	if ((n_tx + n_rx) > SPI_BUFSIZ || !mutex_trylock(&lock)) {
-		local_buf = kmalloc(max((unsigned)SPI_BUFSIZ, n_tx + n_rx), GFP_KERNEL);
+		local_buf = kmalloc(max((unsigned)SPI_BUFSIZ, n_tx + n_rx),
+				    GFP_KERNEL | GFP_DMA);
 		if (!local_buf)
 			return -ENOMEM;
 	} else {