diff options
| author |   Jens Axboe <axboe@fb.com> | 2017-04-24 22:03:14 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-24 22:03:14 -0600 |
| commit | d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1 (patch) | |
| tree | 9139831824ebe9cf77d1bf836b558ee2061c0483 /drivers/scsi/scsi_lib.c | |
| parent | lightnvm: pblk: fix erase counters on error fail (diff) | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| download | wireguard-linux-d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1.tar.xz wireguard-linux-d9fd363a6cbfae24ffaa00ac6fd3ce8e271acaf1.zip | |
Merge branch 'master' into for-4.12/post-merge
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -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 4a20e6098f7c..abc391e00f7d 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1060,10 +1060,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) |