Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is a set of three fixes: one to correct an abort path thinko
  causing failures (and a panic) in USB on device misbehaviour, One to
  fix an out of order issue in the fnic driver and one to match discard
  expectations to qemu which otherwise cause Linux to behave badly as a
  guest"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  SCSI: fix regression in scsi_send_eh_cmnd()
  fnic: IOMMU Fault occurs when IO and abort IO is out of order
  sd: tweak discard heuristics to work around QEMU SCSI issue

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;
         }