aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha [êölä <juha.yrjola@solidboot.com>2006-08-06 09:58:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-08-06 09:58:22 +0100
commitc723e08af18e60cda3bbc90e0d6fb688587aeb9f (patch)
tree54d5aeb522be373c1cae8b4e41e6d515512999c2
parentf5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff)
downloadkernel_samsung_crespo-c723e08af18e60cda3bbc90e0d6fb688587aeb9f.zip
kernel_samsung_crespo-c723e08af18e60cda3bbc90e0d6fb688587aeb9f.tar.gz
kernel_samsung_crespo-c723e08af18e60cda3bbc90e0d6fb688587aeb9f.tar.bz2
[ARM] 3744/1: MMC: mmcqd gets stuck when block queue is plugged
Patch from Juha [êölä When the block queue is plugged, mq->req must be set to NULL. Otherwise mq->req might be left non-NULL, even though mmcqd is not processing a request, thus preventing the MMC queue thread from being woken up when new requests do arrive. Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/mmc/mmc_queue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c
index 0b9682e..74f8cde 100644
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/mmc_queue.c
@@ -79,7 +79,8 @@ static int mmc_queue_thread(void *d)
spin_lock_irq(q->queue_lock);
set_current_state(TASK_INTERRUPTIBLE);
if (!blk_queue_plugged(q))
- mq->req = req = elv_next_request(q);
+ req = elv_next_request(q);
+ mq->req = req;
spin_unlock_irq(q->queue_lock);
if (!req) {