diff --git a/[refs] b/[refs] index e807af572df5..0bea0f52bc1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4dc210f69bcb0b4bef5a83b1c323817be89bad1 +refs/heads/master: addd0a09fc06179f2e02b4221775d9ab265c9fc7 diff --git a/trunk/block/blk-exec.c b/trunk/block/blk-exec.c index 81e31819a597..8a0e7ec056e7 100644 --- a/trunk/block/blk-exec.c +++ b/trunk/block/blk-exec.c @@ -56,7 +56,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, spin_lock_irq(q->queue_lock); __elv_add_request(q, rq, where); __blk_run_queue(q); - /* the queue is stopped so it won't be plugged+unplugged */ + /* the queue is stopped so it won't be run */ if (rq->cmd_type == REQ_TYPE_PM_RESUME) q->request_fn(q); spin_unlock_irq(q->queue_lock);