diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-14 06:50:37 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-14 06:51:07 (GMT) |
| commit | a4c98f8bbeafee12c979c90743f6fda94f7515c7 (patch) | |
| tree | 3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501f /drivers/spi/amba-pl022.c | |
| parent | f4ad9bd208c98f32a6f9136618e0b8bebe3fb370 (diff) | |
| parent | 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (diff) | |
| download | linux-fsl-qoriq-a4c98f8bbeafee12c979c90743f6fda94f7515c7.tar.xz | |
Merge branch 'linus' into sched/locking
Merge reason: Pick up this upstream commit:
6631e635c65d: block: don't flush plugged IO on forced preemtion scheduling
As it modifies the scheduler and we'll queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/spi/amba-pl022.c')
| -rw-r--r-- | drivers/spi/amba-pl022.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 5825370..08de58e 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c @@ -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); |