diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /drivers/mmc/mmc_queue.c | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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) { |