diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2015-01-19 16:00:15 -0600 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2015-01-19 16:00:15 -0600 |
| commit | fe6e91e3387e4f90ed4605a1a538248a31686c16 (patch) | |
| tree | d4e10d0d214ca73500fcbb3dbbd25027320fddda /drivers/net/ethernet/qlogic/qla3xxx.c | |
| parent | c6574542149dede8093e326d2c358ba447e30f33 (diff) | |
| parent | 38bdf45f4aa5cb6186d50a29e6cbbd9d486a1519 (diff) | |
Merge branch 'mvebu/fixes-3' into mvebu/soc
Diffstat (limited to 'drivers/net/ethernet/qlogic/qla3xxx.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qla3xxx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index c2f09af5c25..4847713211c 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c @@ -146,10 +146,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) { int i = 0; - while (i < 10) { - if (i) - ssleep(1); - + do { if (ql_sem_lock(qdev, QL_DRVR_SEM_MASK, (QL_RESOURCE_BITS_BASE_CODE | (qdev->mac_index) @@ -158,7 +155,8 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) "driver lock acquired\n"); return 1; } - } + ssleep(1); + } while (++i < 10); netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n"); return 0; |