From: Christoph Hellwig <hch@lst.de>
Date: Wed, 26 Apr 2017 07:34:21 +0000 (+0200)
Subject: ide-pm: always pass 0 error to __blk_end_request_all
X-Git-Tag: v4.12-rc1~176^2~19
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ce210e92238e976143c07a2d19d18c8919cb16a1;p=karo-tx-linux.git

ide-pm: always pass 0 error to __blk_end_request_all

ide_pm_execute_rq exectures a PM request synchronously, and in the failure
case where it calls __blk_end_request_all it never checks the error field
passed to the end_io callback, so don't bother setting it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index 277c2bb7616f..0977fc1f40ce 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -57,7 +57,7 @@ static int ide_pm_execute_rq(struct request *rq)
 	if (unlikely(blk_queue_dying(q))) {
 		rq->rq_flags |= RQF_QUIET;
 		scsi_req(rq)->result = -ENXIO;
-		__blk_end_request_all(rq, scsi_req(rq)->result);
+		__blk_end_request_all(rq, 0);
 		spin_unlock_irq(q->queue_lock);
 		return -ENXIO;
 	}