scsi: hpsa: add missing hunks in reset-patch (13499345) · Commits · 戴 / test

Correct returning from reset before outstanding commands are completed for the device. Link: https://lore.kernel.org/r/157107623870.17997.11208813089704833029.stgit@brunhilda Reviewed-by:

drivers/scsi/hpsa.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -5474,6 +5474,8 @@ static int hpsa_ciss_submit(struct ctlr_info *h,
		return SCSI_MLQUEUE_HOST_BUSY;
		}

		c->device = dev;

		enqueue_cmd_and_start_io(h, c);
		/* the cmd'll come back via intr handler in complete_scsi_command() */
		return 0;
		@@ -5545,6 +5547,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h,
		hpsa_cmd_init(h, c->cmdindex, c);
		c->cmd_type = CMD_SCSI;
		c->scsi_cmd = cmd;
		c->device = dev;
		rc = hpsa_scsi_ioaccel_raid_map(h, c);
		if (rc < 0) /* scsi_dma_map failed. */
		rc = SCSI_MLQUEUE_HOST_BUSY;
		@@ -5552,6 +5555,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h,
		hpsa_cmd_init(h, c->cmdindex, c);
		c->cmd_type = CMD_SCSI;
		c->scsi_cmd = cmd;
		c->device = dev;
		rc = hpsa_scsi_ioaccel_direct_map(h, c);
		if (rc < 0) /* scsi_dma_map failed. */
		rc = SCSI_MLQUEUE_HOST_BUSY;