From: Don Brace <don.brace@microsemi.com>
Date: Thu, 4 May 2017 22:51:10 +0000 (-0500)
Subject: scsi: hpsa: rescan later if reset in progress
X-Git-Tag: v4.13-rc1~136^2~252
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3b476aa24d44ffb68167d1442f8d12319ef4f183;p=linux.git

scsi: hpsa: rescan later if reset in progress

- schedule another scan.
- mark current scan as completed.

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 2990897b40e0..53a4f34e73c2 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5620,6 +5620,7 @@ static void hpsa_scan_start(struct Scsi_Host *sh)
 	 */
 	if (h->reset_in_progress) {
 		h->drv_req_rescan = 1;
+		hpsa_scan_complete(h);
 		return;
 	}