From d80169ab5fd15a49b7d87a74ffd92b4f409b157f Mon Sep 17 00:00:00 2001
From: "Kashyap, Desai" <kashyap.desai@lsi.com>
Date: Fri, 7 Aug 2009 19:37:14 +0530
Subject: [PATCH] --- yaml --- r: 156999 b: refs/heads/master c:
 6bd4e1e4d6023f4da069fd68729c502cc4e6dfd0 h: refs/heads/master i:   156997:
 8dbef96d4276223c6aed012cd0b43be0134f759a   156995:
 cc8291522d099184d7e3620c7671fdaf056111d2   156991:
 3cba487d3a3bd91990d6ed2e0e823e8db62a3592 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/scsi/mpt2sas/mpt2sas_config.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2cba442e78e7..42532fe239c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be9e8cd75ce8d94ae4aab721fdcc337fa78a9090
+refs/heads/master: 6bd4e1e4d6023f4da069fd68729c502cc4e6dfd0
diff --git a/trunk/drivers/scsi/mpt2sas/mpt2sas_config.c b/trunk/drivers/scsi/mpt2sas/mpt2sas_config.c
index 58cfb97846f7..1c6658c60239 100644
--- a/trunk/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/trunk/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -247,6 +247,12 @@ _config_request(struct MPT2SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
 	retry_count = 0;
 
  retry_config:
+	if (retry_count) {
+		if (retry_count > 2) /* attempt only 2 retries */
+			return -EFAULT;
+		printk(MPT2SAS_INFO_FMT "%s: attempting retry (%d)\n",
+		    ioc->name, __func__, retry_count);
+	}
 	wait_state_count = 0;
 	ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
 	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {