summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-26 03:34:21 -0400
committerJens Axboe <axboe@fb.com>2017-04-26 09:53:34 -0400
commitce210e92238e976143c07a2d19d18c8919cb16a1 (patch)
treefd793bd43dd0907967f7b133decaa7cd3cfe59a0 /drivers/ide
parentd188b90c48e418e102a1f42872b13dfe386ab6a7 (diff)
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-pm.c2
1 files changed, 1 insertions, 1 deletions
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)
57 if (unlikely(blk_queue_dying(q))) { 57 if (unlikely(blk_queue_dying(q))) {
58 rq->rq_flags |= RQF_QUIET; 58 rq->rq_flags |= RQF_QUIET;
59 scsi_req(rq)->result = -ENXIO; 59 scsi_req(rq)->result = -ENXIO;
60 __blk_end_request_all(rq, scsi_req(rq)->result); 60 __blk_end_request_all(rq, 0);
61 spin_unlock_irq(q->queue_lock); 61 spin_unlock_irq(q->queue_lock);
62 return -ENXIO; 62 return -ENXIO;
63 } 63 }