summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-pm.c')
-rw-r--r--drivers/ide/ide-pm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index bf513f886f3c..277c2bb7616f 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -28,7 +28,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
28 rqpm.pm_state = mesg.event; 28 rqpm.pm_state = mesg.event;
29 29
30 blk_execute_rq(drive->queue, NULL, rq, 0); 30 blk_execute_rq(drive->queue, NULL, rq, 0);
31 ret = rq->errors ? -EIO : 0; 31 ret = scsi_req(rq)->result ? -EIO : 0;
32 blk_put_request(rq); 32 blk_put_request(rq);
33 33
34 if (ret == 0 && ide_port_acpi(hwif)) { 34 if (ret == 0 && ide_port_acpi(hwif)) {
@@ -56,8 +56,8 @@ static int ide_pm_execute_rq(struct request *rq)
56 spin_lock_irq(q->queue_lock); 56 spin_lock_irq(q->queue_lock);
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 rq->errors = -ENXIO; 59 scsi_req(rq)->result = -ENXIO;
60 __blk_end_request_all(rq, rq->errors); 60 __blk_end_request_all(rq, scsi_req(rq)->result);
61 spin_unlock_irq(q->queue_lock); 61 spin_unlock_irq(q->queue_lock);
62 return -ENXIO; 62 return -ENXIO;
63 } 63 }
@@ -67,7 +67,7 @@ static int ide_pm_execute_rq(struct request *rq)
67 67
68 wait_for_completion_io(&wait); 68 wait_for_completion_io(&wait);
69 69
70 return rq->errors ? -EIO : 0; 70 return scsi_req(rq)->result ? -EIO : 0;
71} 71}
72 72
73int generic_ide_resume(struct device *dev) 73int generic_ide_resume(struct device *dev)