aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2009-08-07 10:07:14 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-08-13 17:30:03 -0400
commit6bd4e1e4d6023f4da069fd68729c502cc4e6dfd0 (patch)
tree8d72a054d45f1a779b0b7cf0f7d332646c6842a4 /drivers/scsi/mpt2sas
parentbe9e8cd75ce8d94ae4aab721fdcc337fa78a9090 (diff)
[SCSI] mpt2sas: fix infinite loop inside config request
This restriction is introduced just to avoid loop of config_request. Retry must be limited so we have restricted config request to maximum 2 times. Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_config.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 58cfb97846f7..1c6658c60239 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -247,6 +247,12 @@ _config_request(struct MPT2SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
247 retry_count = 0; 247 retry_count = 0;
248 248
249 retry_config: 249 retry_config:
250 if (retry_count) {
251 if (retry_count > 2) /* attempt only 2 retries */
252 return -EFAULT;
253 printk(MPT2SAS_INFO_FMT "%s: attempting retry (%d)\n",
254 ioc->name, __func__, retry_count);
255 }
250 wait_state_count = 0; 256 wait_state_count = 0;
251 ioc_state = mpt2sas_base_get_iocstate(ioc, 1); 257 ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
252 while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) { 258 while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {