---

yaml --- r: 350779 b: refs/heads/master c: 2cd94c8 h: refs/heads/master i: 350777: fe9cfce 350775: 296046c v: v3
git-mirror · Feb 5, 2013 · f5ae225 · f5ae225
1 parent b737707
commit f5ae225
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 {