summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLi, Zhen-Hua <zhen-hual@hp.com>2014-04-15 09:53:11 +0800
committerDavid S. Miller <davem@davemloft.net>2014-04-15 00:08:22 -0400
commit1dd333f470b4e1767c9c0a14b05b5104e56b2930 (patch)
tree0639f21162bc244a6d0dd21789409738fa249465 /drivers/net
parent2168746cfc075d004fd7044be706054fceb24e59 (diff)
downloadlinux-1dd333f470b4e1767c9c0a14b05b5104e56b2930.tar.bz2
driver/net: cosa driver uses udelay incorrectly
In cosa driver, udelay with more than 20000 may cause __bad_udelay. Use msleep for instead. Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wan/cosa.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 84734a805092..83c39e2858bf 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -1521,11 +1521,7 @@ static int cosa_reset_and_read_id(struct cosa_data *cosa, char *idstring)
cosa_putstatus(cosa, 0);
cosa_getdata8(cosa);
cosa_putstatus(cosa, SR_RST);
-#ifdef MODULE
msleep(500);
-#else
- udelay(5*100000);
-#endif
/* Disable all IRQs from the card */
cosa_putstatus(cosa, 0);