1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 5901937284e7..d7a49dcfa85e 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -273,7 +273,7 @@ void ide_retry_pc(ide_drive_t *drive)
         ide_requeue_and_plug(drive, failed_rq);
         if (ide_queue_sense_rq(drive, pc)) {
                 blk_start_request(failed_rq);
-                ide_complete_rq(drive, -EIO, blk_rq_bytes(failed_rq));
+                ide_complete_rq(drive, BLK_STS_IOERR, blk_rq_bytes(failed_rq));
         }
 }
 EXPORT_SYMBOL_GPL(ide_retry_pc);
@@ -437,7 +437,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
         /* No more interrupts */
         if ((stat & ATA_DRQ) == 0) {
-                int uptodate, error;
+                int uptodate;
+                blk_status_t error;
 
                 debug_log("Packet command completed, %d bytes transferred\n",
                           blk_rq_bytes(rq));
@@ -490,7 +491,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
                 if (ata_misc_request(rq)) {
                         scsi_req(rq)->result = 0;
-                        error = 0;
+                        error = BLK_STS_OK;
                 } else {
 
                         if (blk_rq_is_passthrough(rq) && uptodate <= 0) {
@@ -498,7 +499,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                                         scsi_req(rq)->result = -EIO;
                         }
 
-                        error = uptodate ? 0 : -EIO;
+                        error = uptodate ? BLK_STS_OK : BLK_STS_IOERR;
                 }
 
                 ide_complete_rq(drive, error, blk_rq_bytes(rq));