From: Li, Zhen-Hua <zhen-hual@hp.com>
Date: Tue, 15 Apr 2014 01:53:11 +0000 (+0800)
Subject: driver/net: cosa driver uses udelay incorrectly
X-Git-Tag: v3.15-rc2~39^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dd333f470b4e1767c9c0a14b05b5104e56b2930;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 84734a8050925..83c39e2858bf7 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);