Commit 8919358e authored by Tomas Henzl's avatar Tomas Henzl Committed by James Bottomley
Browse files

[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: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 9846590e

drivers/scsi/hpsa.c

+2 −1
Original line number Diff line number Diff line
@@ -4142,7 +4142,7 @@ static int hpsa_register_scsi(struct ctlr_info *h) 
static int wait_for_device_to_become_ready(struct ctlr_info *h,

	unsigned char lunaddr[])

{

	int rc = 0;

	int rc;

	int count = 0;

	int waittime = 1; /* seconds */

	struct CommandList *c;
@@ -4162,6 +4162,7 @@ static int wait_for_device_to_become_ready(struct ctlr_info *h, 
		 */

		msleep(1000 * waittime);

		count++;

		rc = 0; /* Device ready. */



		/* Increase wait time with each try, up to a point. */

		if (waittime < HPSA_MAX_WAIT_INTERVAL_SECS)