7 files changed, 21 insertions, 18 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 92c6ef6feb57..5d57af29c4c8 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -402,9 +402,10 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                 if (uptodate == 0)
                         drive->failed_pc = NULL;
 
-                if (blk_special_request(rq))
+                if (blk_special_request(rq)) {
+                        rq->errors = 0;
                         ide_complete_rq(drive, 0);
-                else
+                } else
                         ide_end_request(drive, uptodate, 0);
 
                 return ide_stopped;
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index f6e1a82a3cc5..d1385d332e94 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -123,17 +123,18 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat)
 
         /* retry only "normal" I/O: */
         if (!blk_fs_request(rq)) {
-                rq->errors = 1;
                 if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
                         struct ide_cmd *cmd = rq->special;
 
                         if (cmd)
                                 ide_complete_cmd(drive, cmd, stat, err);
                 } else if (blk_pm_request(rq)) {
+                        rq->errors = 1;
                         ide_complete_pm_rq(drive, rq);
                         return ide_stopped;
                 }
-                ide_complete_rq(drive, err);
+                rq->errors = err;
+                ide_complete_rq(drive, err ? -EIO : 0);
                 return ide_stopped;
         }
 
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index f56e9a918b99..407e4914dfd1 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -260,7 +260,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
                         printk(KERN_ERR PFX "%s: I/O error\n", drive->name);
 
                 if (blk_special_request(rq)) {
-                        rq->errors = IDE_DRV_ERROR_GENERAL;
+                        rq->errors = 0;
                         ide_complete_rq(drive, 0);
                         return ide_stopped;
                 } else
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c38426de6041..4cc2bb13f1d6 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -144,17 +144,14 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
                 kfree(cmd);
 }
 
-void ide_complete_rq(ide_drive_t *drive, u8 err)
+void ide_complete_rq(ide_drive_t *drive, int error)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->rq;
 
         hwif->rq = NULL;
 
-        rq->errors = err;
-
-        if (unlikely(blk_end_request(rq, (rq->errors ? -EIO : 0),
-                                     blk_rq_bytes(rq))))
+        if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq))))
                 BUG();
 }
 EXPORT_SYMBOL(ide_complete_rq);
@@ -166,13 +163,14 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq)
 
         drive->failed_pc = NULL;
 
-        if ((media == ide_floppy && drv_req) || media == ide_tape)
-                rq->errors = IDE_DRV_ERROR_GENERAL;
-
-        if ((media == ide_floppy || media == ide_tape) && drv_req)
+        if ((media == ide_floppy || media == ide_tape) && drv_req) {
+                rq->errors = 0;
                 ide_complete_rq(drive, 0);
-        else
+        } else {
+                if (media == ide_tape)
+                        rq->errors = IDE_DRV_ERROR_GENERAL;
                 ide_end_request(drive, 0, 0);
+        }
 }
 
 static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
@@ -312,6 +310,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
 #ifdef DEBUG
         printk("%s: DRIVE_CMD (null)\n", drive->name);
 #endif
+        rq->errors = 0;
         ide_complete_rq(drive, 0);
 
         return ide_stopped;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index a42e49c6cc3f..3bfcd7290ce0 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -774,8 +774,8 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                 if (rq != postponed_rq) {
                         printk(KERN_ERR "ide-tape: ide-tape.c bug - "
                                         "Two DSC requests were queued\n");
-                        rq->errors = IDE_DRV_ERROR_GENERAL;
                         drive->failed_pc = NULL;
+                        rq->errors = 0;
                         ide_complete_rq(drive, 0);
                         return ide_stopped;
                 }
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index f99a6aaad9eb..e9d008ef3f33 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -289,10 +289,12 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
 
 void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
 {
+        struct request *rq = drive->hwif->rq;
         u8 err = ide_read_error(drive);
 
         ide_complete_cmd(drive, cmd, stat, err);
-        ide_complete_rq(drive, err);
+        rq->errors = err;
+        ide_complete_rq(drive, err ? -EIO : 0);
 }
 
 /*
diff --git a/include/linux/ide.h b/include/linux/ide.h
index f910f4ccfaa0..32369d5797de 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1166,7 +1166,7 @@ extern int ide_devset_execute(ide_drive_t *drive,
                               const struct ide_devset *setting, int arg);
 
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
-void ide_complete_rq(ide_drive_t *, u8);
+void ide_complete_rq(ide_drive_t *, int);
 
 void ide_tf_dump(const char *, struct ide_taskfile *);