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

Pull SCSI fix from James Bottomley:
 "Our final fix before the 4.12 release (hopefully).

  It's an error leg again: the fix to not bug on empty DMA transfers is
  returning the wrong code and confusing the block layer"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: return correct blkprep status code in case scsi_init_io() fails.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index e5a2d590a104..15c9fe766071 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
         struct scsi_device *sdev = cmd->device;
         struct request *rq = cmd->request;
         bool is_mq = (rq->mq_ctx != NULL);
-        int error;
+        int error = BLKPREP_KILL;
 
         if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
-                return -EINVAL;
+                goto err_exit;
 
         error = scsi_init_sgtable(rq, &cmd->sdb);
         if (error)