Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / dw_spi.c

diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index b1a4b9f503ae06c1d7cef7eb0019c57c90453e24..871e337c917fe7313621e651be0da62891545b05 100644 (file)
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -821,7 +821,7 @@ static int stop_queue(struct dw_spi *dws)
 
        spin_lock_irqsave(&dws->lock, flags);
        dws->run = QUEUE_STOPPED;
-       while (!list_empty(&dws->queue) && dws->busy && limit--) {
+       while ((!list_empty(&dws->queue) || dws->busy) && limit--) {
                spin_unlock_irqrestore(&dws->lock, flags);
                msleep(10);
                spin_lock_irqsave(&dws->lock, flags);