From ec4f10d551b76ef6ddc5b042386bcddc0503ec26 Mon Sep 17 00:00:00 2001 From: Grzegorz Sygieda Date: Thu, 20 May 2010 22:28:30 +0000 Subject: [PATCH] --- yaml --- r: 198405 b: refs/heads/master c: 4a12404ddaa06e8ec5e2c0d8ece4d821281e6024 h: refs/heads/master i: 198403: bb9d516f81480ce524e31f87cd6a4f9607c3dfa5 v: v3 --- [refs] | 2 +- trunk/drivers/spi/amba-pl022.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index efd3a7de9e20..0c30dace5683 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 781c7b129b1beb876905f7212927aa0ee1b022e5 +refs/heads/master: 4a12404ddaa06e8ec5e2c0d8ece4d821281e6024 diff --git a/trunk/drivers/spi/amba-pl022.c b/trunk/drivers/spi/amba-pl022.c index c75831c1deda..f0a1418ce660 100644 --- a/trunk/drivers/spi/amba-pl022.c +++ b/trunk/drivers/spi/amba-pl022.c @@ -1211,7 +1211,6 @@ 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 */ - pl022->run = QUEUE_STOPPED; while (!list_empty(&pl022->queue) && pl022->busy && limit--) { spin_unlock_irqrestore(&pl022->queue_lock, flags); msleep(10); @@ -1220,6 +1219,7 @@ static int stop_queue(struct pl022 *pl022) if (!list_empty(&pl022->queue) || pl022->busy) status = -EBUSY; + else pl022->run = QUEUE_STOPPED; spin_unlock_irqrestore(&pl022->queue_lock, flags);