Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 8005f9869481..079e6b1b0cdb 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);