[dahdi-commits] sruffell: branch linux/sruffell/dahdi-linux-wctc4xxp r8789 - /linux/team/sruf...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Fri Jun 18 17:55:02 2010
New Revision: 8789

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8789
Log:
Revert "wctc4xxp: Shorten wait time for link from 10 to 1 second"

This reverts commit b627f83265d74a6afea54cba92761625fdb8b858.

Modified:
    linux/team/sruffell/dahdi-linux-wctc4xxp/drivers/dahdi/wctc4xxp/base.c

Modified: linux/team/sruffell/dahdi-linux-wctc4xxp/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/dahdi-linux-wctc4xxp/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=8789&r1=8788&r2=8789
==============================================================================
--- linux/team/sruffell/dahdi-linux-wctc4xxp/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-wctc4xxp/drivers/dahdi/wctc4xxp/base.c Fri Jun 18 17:55:02 2010
@@ -2832,12 +2832,13 @@
 wctc4xxp_wait_for_link(struct wcdte *wc)
 {
 	int reg;
-	unsigned long stop;
-	stop = jiffies + HZ;
+	unsigned int delay_count = 0;
 	do {
 		reg = wctc4xxp_getctl(wc, 0x00fc);
 		msleep(2);
-		if (time_after(jiffies, stop)) {
+		delay_count++;
+
+		if (delay_count >= 5000) {
 			DTE_PRINTK(ERR, "Failed to link to DTE processor!\n");
 			return -EIO;
 		}