diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-04-15 12:36:06 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-04-15 12:36:06 -0400 |
| commit | ca855a5e2679e9e571dfb0e64f4484b36f1992a8 (patch) | |
| tree | 327d76200422d7c308d44354b1eef49cc3c6ec6c | |
| parent | 0e1bfea999daa27c801b19617a6ef8b8ec4adc75 (diff) | |
| parent | e7661a8e5ce10b5321882d0bbaf3f81070903319 (diff) | |
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 19125d72f322..5558e212368b 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) | |||
| 1061 | struct scsi_device *sdev = cmd->device; | 1061 | struct scsi_device *sdev = cmd->device; |
| 1062 | struct request *rq = cmd->request; | 1062 | struct request *rq = cmd->request; |
| 1063 | bool is_mq = (rq->mq_ctx != NULL); | 1063 | bool is_mq = (rq->mq_ctx != NULL); |
| 1064 | int error; | 1064 | int error = BLKPREP_KILL; |
| 1065 | 1065 | ||
| 1066 | if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq))) | 1066 | if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq))) |
| 1067 | return -EINVAL; | 1067 | goto err_exit; |
| 1068 | 1068 | ||
| 1069 | error = scsi_init_sgtable(rq, &cmd->sdb); | 1069 | error = scsi_init_sgtable(rq, &cmd->sdb); |
| 1070 | if (error) | 1070 | if (error) |