From: Xiang Chen <chenxiang66@hisilicon.com>
Date: Tue, 24 Oct 2017 15:51:32 +0000 (+0800)
Subject: scsi: hisi_sas: fix internal abort slot timeout bug
X-Git-Tag: v4.15-rc1~125^2~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f692a677e2cb0ccab4ef91be97d8fb020cca246d;p=thirdparty%2Flinux.git

scsi: hisi_sas: fix internal abort slot timeout bug

When an internal abort times out in hisi_sas_internal_task_abort(),
goto the exit label in and not go through the other task status
checks.

Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 9e2990268f00a..0eb9174f79a81 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1469,6 +1469,7 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
 			if (slot)
 				slot->task = NULL;
 			dev_err(dev, "internal task abort: timeout.\n");
+			goto exit;
 		}
 	}