1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index cbe38e5e7955..7e957918f33f 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -131,7 +131,7 @@ scmd_eh_abort_handler(struct work_struct *work)
                                     "aborting command %p\n", scmd));
                 rtn = scsi_try_to_abort_cmd(sdev->host->hostt, scmd);
                 if (rtn == SUCCESS) {
-                        scmd->result |= DID_TIME_OUT << 16;
+                        set_host_byte(scmd, DID_TIME_OUT);
                         if (scsi_host_eh_past_deadline(sdev->host)) {
                                 SCSI_LOG_ERROR_RECOVERY(3,
                                         scmd_printk(KERN_INFO, scmd,
@@ -167,7 +167,7 @@ scmd_eh_abort_handler(struct work_struct *work)
                         scmd_printk(KERN_WARNING, scmd,
                                     "scmd %p terminate "
                                     "aborted command\n", scmd));
-                scmd->result |= DID_TIME_OUT << 16;
+                set_host_byte(scmd, DID_TIME_OUT);
                 scsi_finish_command(scmd);
         }
 }
@@ -287,15 +287,15 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
         else if (host->hostt->eh_timed_out)
                 rtn = host->hostt->eh_timed_out(scmd);
 
-        if (rtn == BLK_EH_NOT_HANDLED && !host->hostt->no_async_abort)
-                if (scsi_abort_command(scmd) == SUCCESS)
+        if (rtn == BLK_EH_NOT_HANDLED) {
+                if (!host->hostt->no_async_abort &&
+                    scsi_abort_command(scmd) == SUCCESS)
                         return BLK_EH_NOT_HANDLED;
 
-        scmd->result |= DID_TIME_OUT << 16;
-
-        if (unlikely(rtn == BLK_EH_NOT_HANDLED &&
-                     !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD)))
-                rtn = BLK_EH_HANDLED;
+                set_host_byte(scmd, DID_TIME_OUT);
+                if (!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))
+                        rtn = BLK_EH_HANDLED;
+        }
 
         return rtn;
 }
@@ -1777,7 +1777,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                 break;
         case DID_ABORT:
                 if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) {
-                        scmd->result |= DID_TIME_OUT << 16;
+                        set_host_byte(scmd, DID_TIME_OUT);
                         return SUCCESS;
                 }
         case DID_NO_CONNECT: