qlcnic: fix a loop exit condition better

Dan Carpenter · davem330 · commit 3358a5c0c157 · 2015-12-24T11:02:35.000-05:00
In the original code, if we succeeded on the last iteration through the loop then we still returned failure. Fixes: 389e4e0 ('qlcnic: fix a timeout loop') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
@@ -252,7 +252,7 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *adapter)
 		state = QLCRDX(ahw, QLC_83XX_VNIC_STATE);
 	}
 
-	if (!idc->vnic_wait_limit) {
+	if (state != QLCNIC_DEV_NPAR_OPER) {
 		dev_err(&adapter->pdev->dev,
 			"vNIC mode not operational, state check timed out.\n");
 		return -EIO;

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *adapter)`
`252`	`252`	`state = QLCRDX(ahw, QLC_83XX_VNIC_STATE);`
`253`	`253`	`}`
`254`	`254`
`255`		`- if (!idc->vnic_wait_limit) {`
	`255`	`+ if (state != QLCNIC_DEV_NPAR_OPER) {`
`256`	`256`	`dev_err(&adapter->pdev->dev,`
`257`	`257`	`"vNIC mode not operational, state check timed out.\n");`
`258`	`258`	`return -EIO;`