From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Thu, 24 Apr 2008 22:21:24 +0000 (-0700)
Subject: [SCSI] qla2xxx: Correct ISP84XX verify-chip response handling.
X-Git-Tag: v2.6.26-rc1~1027^2~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1ec1f1bf9cb1ba80e79a74d48bcfb5da246d6f6;p=karo-tx-linux.git

[SCSI] qla2xxx: Correct ISP84XX verify-chip response handling.

Earlier code could trigger an infinite-retry if 1st invocation
returned a non-CS_COMPLETE status.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7d0a8a4c7719..a9cb8291f58e 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2982,8 +2982,8 @@ qla84xx_verify_chip(struct scsi_qla_host *ha, uint16_t *status)
 	/* We update the firmware with only one data sequence. */
 	options |= VCO_END_OF_DATA;
 
-	retry = 0;
 	do {
+		retry = 0;
 		memset(mn, 0, sizeof(*mn));
 		mn->p.req.entry_type = VERIFY_CHIP_IOCB_TYPE;
 		mn->p.req.entry_count = 1;