diff options
| author | Florian Fainelli <florian.fainelli@telecomint.eu> | 2008-09-03 16:50:03 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:54:43 -0400 |
| commit | c1d69937ee5818bcde3bed8c012c9f07d60e492e (patch) | |
| tree | 534899fc1f7079509103269589592c650898bea1 /drivers/net/r6040.c | |
| parent | 31b760202a0911384fa07796df9d1905e9e89a7f (diff) | |
| download | linux-3.10-c1d69937ee5818bcde3bed8c012c9f07d60e492e.tar.gz linux-3.10-c1d69937ee5818bcde3bed8c012c9f07d60e492e.tar.bz2 linux-3.10-c1d69937ee5818bcde3bed8c012c9f07d60e492e.zip | |
r6040: fix bad usage of udelay
This patch fixes the bad usage of udelay(5000), which in turns is a
mdelay(5). It causes compilation for ARM where udelay maximum value
is checked.
Reported-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 5d86281d936..025f526558b 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -370,7 +370,7 @@ static void r6040_init_mac_regs(struct net_device *dev) /* Reset internal state machine */ iowrite16(2, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM); - udelay(5000); + mdelay(5); /* MAC Bus Control Register */ iowrite16(MBCR_DEFAULT, ioaddr + MBCR); @@ -806,7 +806,7 @@ static void r6040_mac_address(struct net_device *dev) iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(0, ioaddr + MAC_SM); - udelay(5000); + mdelay(5); /* Restore MAC Address */ adrp = (u16 *) dev->dev_addr; |