joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2025-01-09 05:40:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r6040: fix bad usage of udelay

Browse Source 
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>
This commit is contained in:
Florian Fainelli 2008-09-03 16:50:03 +02:00 committed by Jeff Garzik
parent 31b760202a
commit c1d69937ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/r6040.c
View File

@ -370,7 +370,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
/* Reset internal state machine */ /* Reset internal state machine */
iowrite16(2, ioaddr + MAC_SM); iowrite16(2, ioaddr + MAC_SM);
iowrite16(0, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM);
udelay(5000); mdelay(5);
/* MAC Bus Control Register */ /* MAC Bus Control Register */
iowrite16(MBCR_DEFAULT, ioaddr + MBCR); 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(0x01, ioaddr + MCR1); /* Reset MAC */
iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */
iowrite16(0, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM);
udelay(5000); mdelay(5);
/* Restore MAC Address */ /* Restore MAC Address */
adrp = (u16 *) dev->dev_addr; adrp = (u16 *) dev->dev_addr;