aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Henzl <thenzl@redhat.com>2014-02-21 17:25:05 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 13:19:23 -0400
commit8919358e3d3e78b97490d9d6b0179685962df58f (patch)
tree049b69bcd71c372f3bc359dac60df917494f241c
parent9846590edadb3c961fed095d6b3c0af947230e69 (diff)
[SCSI] hpsa: increase the probability of a reported success after a device reset
rc is set in the loop, and it isn't set back to zero anywhere this patch fixes it Signed-off-by: Tomas Henzl <thenzl@redhat.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/hpsa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 6e5e6939ce39..388e229cdcec 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4142,7 +4142,7 @@ static int hpsa_register_scsi(struct ctlr_info *h)
4142static int wait_for_device_to_become_ready(struct ctlr_info *h, 4142static int wait_for_device_to_become_ready(struct ctlr_info *h,
4143 unsigned char lunaddr[]) 4143 unsigned char lunaddr[])
4144{ 4144{
4145 int rc = 0; 4145 int rc;
4146 int count = 0; 4146 int count = 0;
4147 int waittime = 1; /* seconds */ 4147 int waittime = 1; /* seconds */
4148 struct CommandList *c; 4148 struct CommandList *c;
@@ -4162,6 +4162,7 @@ static int wait_for_device_to_become_ready(struct ctlr_info *h,
4162 */ 4162 */
4163 msleep(1000 * waittime); 4163 msleep(1000 * waittime);
4164 count++; 4164 count++;
4165 rc = 0; /* Device ready. */
4165 4166
4166 /* Increase wait time with each try, up to a point. */ 4167 /* Increase wait time with each try, up to a point. */
4167 if (waittime < HPSA_MAX_WAIT_INTERVAL_SECS) 4168 if (waittime < HPSA_MAX_WAIT_INTERVAL_SECS)