diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
| commit | e9ffb3d7ec94083a44a8721681391beca2ffd68c (patch) | |
| tree | 6768ab487b3f44c2a4995ee61307e47760ca9b88 /drivers/mmc/mmc_queue.c | |
| parent | 8b9411014e6f18a883c18b38f41338dbd53fddea (diff) | |
| parent | e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/mmc/mmc_queue.c')
| -rw-r--r-- | drivers/mmc/mmc_queue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c index 0b9682e9a357..74f8cdeeff0f 100644 --- a/drivers/mmc/mmc_queue.c +++ b/drivers/mmc/mmc_queue.c | |||
| @@ -79,7 +79,8 @@ static int mmc_queue_thread(void *d) | |||
| 79 | spin_lock_irq(q->queue_lock); | 79 | spin_lock_irq(q->queue_lock); |
| 80 | set_current_state(TASK_INTERRUPTIBLE); | 80 | set_current_state(TASK_INTERRUPTIBLE); |
| 81 | if (!blk_queue_plugged(q)) | 81 | if (!blk_queue_plugged(q)) |
| 82 | mq->req = req = elv_next_request(q); | 82 | req = elv_next_request(q); |
| 83 | mq->req = req; | ||
| 83 | spin_unlock_irq(q->queue_lock); | 84 | spin_unlock_irq(q->queue_lock); |
| 84 | 85 | ||
| 85 | if (!req) { | 86 | if (!req) { |