From: Don Brace <don.brace@microsemi.com>
Date: Thu, 4 May 2017 22:51:16 +0000 (-0500)
Subject: scsi: hpsa: correct resets on retried commands
X-Git-Tag: v4.13-rc1~136^2~251
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d2315ce6e3d09c8dbc9ee93ef6b3f5213e8325ac;p=karo-tx-linux.git

scsi: hpsa: correct resets on retried commands

- call scsi_done when the command completes.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 53a4f34e73c2..a2852daa11c2 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5465,7 +5465,7 @@ static void hpsa_command_resubmit_worker(struct work_struct *work)
 		return hpsa_cmd_free_and_done(c->h, c, cmd);
 	}
 	if (c->reset_pending)
-		return hpsa_cmd_resolve_and_free(c->h, c);
+		return hpsa_cmd_free_and_done(c->h, c, cmd);
 	if (c->abort_pending)
 		return hpsa_cmd_abort_and_free(c->h, c, cmd);
 	if (c->cmd_type == CMD_IOACCEL2) {