diff options
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 2edbe1903804..d1e0a316826d 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -1661,7 +1661,8 @@ int spi_write_then_read(struct spi_device *spi, | |||
| 1661 | * using the pre-allocated buffer or the transfer is too large. | 1661 | * using the pre-allocated buffer or the transfer is too large. |
| 1662 | */ | 1662 | */ |
| 1663 | if ((n_tx + n_rx) > SPI_BUFSIZ || !mutex_trylock(&lock)) { | 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 | if (!local_buf) | 1666 | if (!local_buf) |
| 1666 | return -ENOMEM; | 1667 | return -ENOMEM; |
| 1667 | } else { | 1668 | } else { |