From 8b1e0c790724c1eaa882b47fd4a694c61891345b Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Thu, 25 Aug 2011 00:36:38 -0500
Subject: [PATCH] --- yaml --- r: 271025 b: refs/heads/master c:
 76e4e12ff2b3ef86773989fd897b194eb38016e6 h: refs/heads/master i:   271023:
 c28d65011d8cd65f71b4eae69c046894f3c9cb40 v: v3

---
 [refs]                         | 2 +-
 trunk/include/scsi/scsi_host.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0a3185573dc9..c9c0d7344e6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eccdcd026ae7359e22b70444b8a45f712f05cc37
+refs/heads/master: 76e4e12ff2b3ef86773989fd897b194eb38016e6
diff --git a/trunk/include/scsi/scsi_host.h b/trunk/include/scsi/scsi_host.h
index fc22ad9dba77..50266c9405fc 100644
--- a/trunk/include/scsi/scsi_host.h
+++ b/trunk/include/scsi/scsi_host.h
@@ -804,7 +804,8 @@ static inline struct device *scsi_get_device(struct Scsi_Host *shost)
  **/
 static inline int scsi_host_scan_allowed(struct Scsi_Host *shost)
 {
-	return shost->shost_state == SHOST_RUNNING;
+	return shost->shost_state == SHOST_RUNNING ||
+	       shost->shost_state == SHOST_RECOVERY;
 }
 
 extern void scsi_unblock_requests(struct Scsi_Host *);