diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:40:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-27 21:40:39 -0700 |
| commit | f379a071091b7ff0a7742ac5e02527897aeb8da4 (patch) | |
| tree | 7bc3c1b980db45f1c8a36cf2faf5423aeed7e173 /drivers/spi/spi-atmel.c | |
| parent | d952795d8193c5a7a8eabdc14fab48777fdcd7c8 (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into tty-next
Diffstat (limited to 'drivers/spi/spi-atmel.c')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 8005f986948..079e6b1b0cd 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1115,8 +1115,11 @@ static int atmel_spi_one_transfer(struct spi_master *master, atmel_spi_next_xfer_pio(master, xfer); } + /* interrupts are disabled, so free the lock for schedule */ + atmel_spi_unlock(as); ret = wait_for_completion_timeout(&as->xfer_completion, SPI_DMA_TIMEOUT); + atmel_spi_lock(as); if (WARN_ON(ret == 0)) { dev_err(&spi->dev, "spi trasfer timeout, err %d\n", ret); |