xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-04-11 15:44:38 -07:00
parent b42282e5a0 8faa7cf828
commit 6b98cd5aad
8 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/amba-pl022.c
View File

@@ -1555,7 +1555,7 @@ static int stop_queue(struct pl022 *pl022)
* A wait_queue on the pl022->busy could be used, but then the common
* execution path (pump_messages) would be required to call wake_up or
* friends on every SPI message. Do this instead */
while (!list_empty(&pl022->queue) && pl022->busy && limit--) {
while ((!list_empty(&pl022->queue) || pl022->busy) && limit--) {
spin_unlock_irqrestore(&pl022->queue_lock, flags);
msleep(10);
spin_lock_irqsave(&pl022->queue_lock, flags);