diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-15 16:56:16 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-15 13:11:05 -0500 |
| commit | 389e4e04ad2d4887c7bdd7c01a93d3dfa5c14a06 (patch) | |
| tree | 8f5de9d64c1b5c2b5db94774ddd9c0b586cee172 /drivers/net/ethernet/qlogic/qlcnic | |
| parent | sfc: fix a timeout loop (diff) | |
| download | linux-dev-389e4e04ad2d4887c7bdd7c01a93d3dfa5c14a06.tar.xz linux-dev-389e4e04ad2d4887c7bdd7c01a93d3dfa5c14a06.zip | |
qlcnic: fix a timeout loop
The problem here is that at the end of the loop we test for if
idc->vnic_wait_limit is zero, but since idc->vnic_wait_limit-- is a
post-op, it actually ends up set to (u8)-1. I have fixed this by
moving the decrement inside the loop.
Fixes: 486a5bc77a4a ('qlcnic: Add support for 83xx suspend and resume.')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c index be7d7a62cc0d..b1a452f291ee 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c @@ -246,7 +246,8 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *adapter) u32 state; state = QLCRDX(ahw, QLC_83XX_VNIC_STATE); - while (state != QLCNIC_DEV_NPAR_OPER && idc->vnic_wait_limit--) { + while (state != QLCNIC_DEV_NPAR_OPER && idc->vnic_wait_limit) { + idc->vnic_wait_limit--; msleep(1000); state = QLCRDX(ahw, QLC_83XX_VNIC_STATE); } |