diff options
| author |  Yaniv Rosner <yaniv.rosner@broadcom.com>
| 2010-11-01 05:32:25 +0000 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2010-11-01 06:21:36 -0700 |
| commit | 1d9c05d4d234493351cc39d8129fe5811147b2ff (patch) | |
| tree | a64505602df11d002728c7fe617a3bc0b0a20ce0 /drivers | |
| parent | text ematch: check for NULL pointer before destroying textsearch config (diff) | |
| download | linux-1d9c05d4d234493351cc39d8129fe5811147b2ff.tar.gz linux-1d9c05d4d234493351cc39d8129fe5811147b2ff.tar.bz2 linux-1d9c05d4d234493351cc39d8129fe5811147b2ff.zip | |
bnx2x: Restore appropriate delay during BMAC reset
Fix delay during BMAC reset from 10usec to 1ms.
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 2326774df843..89b33e27f614 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c @@ -610,7 +610,7 @@ static u8 bnx2x_bmac_enable(struct link_params *params, /* reset and unreset the BigMac */ REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR, (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port)); - udelay(10); + msleep(1); REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET, (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port)); |