1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index e42fff6e8c10..8afb01604d51 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1041,7 +1041,7 @@ retry:
                 }
                 /* signal not to enter either branch of the if () below */
                 timeleft = 0;
-                rtn = NEEDS_RETRY;
+                rtn = FAILED;
         } else {
                 timeleft = wait_for_completion_timeout(&done, timeout);
                 rtn = SUCCESS;
@@ -1081,7 +1081,7 @@ retry:
                         rtn = FAILED;
                         break;
                 }
-        } else if (!rtn) {
+        } else if (rtn != FAILED) {
                 scsi_abort_eh_cmnd(scmd);
                 rtn = FAILED;
         }