Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca855a5e authored by James Bottomley's avatar James Bottomley
Browse files

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

parents 0e1bfea9 e7661a8e

drivers/scsi/scsi_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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)