]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ide-pm: always pass 0 error to __blk_end_request_all
authorChristoph Hellwig <hch@lst.de>
Wed, 26 Apr 2017 07:34:21 +0000 (09:34 +0200)
committerJens Axboe <axboe@fb.com>
Wed, 26 Apr 2017 13:53:34 +0000 (07:53 -0600)
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>
drivers/ide/ide-pm.c

index 277c2bb7616ffccea4b7f1d98e4475f3faeb13fe..0977fc1f40ce431979163cd001f01961d79d49f2 100644 (file)
@@ -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;
        }