Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes

This commit is contained in:
James Bottomley 2017-04-15 09:36:06 -07:00
commit ca855a5e26
1 changed files with 2 additions and 2 deletions

View File

@ -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)