diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 02:44:38 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 02:44:38 +0400 |
commit | 6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487 (patch) | |
tree | c38970f362c4de594a7433de5989cae0a199d199 /drivers/spi/dw_spi.c | |
parent | b42282e5a05018ecdc0d63a4ad530b0999785912 (diff) | |
parent | 8faa7cf828bca1745a4ed599876567f5afc47544 (diff) | |
download | linux-6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487.tar.xz |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
dt/fsldma: fix build warning caused by of_platform_device changes
spi: Fix race condition in stop_queue()
gpio/pch_gpio: Fix output value of pch_gpio_direction_output()
gpio/ml_ioh_gpio: Fix output value of ioh_gpio_direction_output()
gpio/pca953x: fix error handling path in probe() call
Diffstat (limited to 'drivers/spi/dw_spi.c')
-rw-r--r-- | drivers/spi/dw_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index b1a4b9f503ae..871e337c917f 100644 --- 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); |