X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=block%2Fblk-exec.c;h=74638ec234c807ccaaed0a77ce0eceb71e2997c7;hb=e4602391e2360a88c110d8ba895991bd1d4dbabc;hp=f71eac35c1b942005f3973fd9c919091b9b08bbd;hpb=193c0d682525987db59ac3a24531a77e4947aa95;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/block/blk-exec.c b/block/blk-exec.c
index f71eac3..74638ec 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -66,7 +66,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 
 	spin_lock_irq(q->queue_lock);
 
-	if (unlikely(blk_queue_dead(q))) {
+	if (unlikely(blk_queue_dying(q))) {
 		rq->errors = -ENXIO;
 		if (rq->end_io)
 			rq->end_io(rq, rq->errors);
@@ -78,7 +78,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
 	__blk_run_queue(q);
 	/* the queue is stopped so it won't be run */
 	if (is_pm_resume)
-		q->request_fn(q);
+		__blk_run_queue_uncond(q);
 	spin_unlock_irq(q->queue_lock);
 }
 EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);