[svn-commits] sruffell: linux/trunk r10296 - /linux/trunk/drivers/dahdi/voicebus/GpakCust.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Nov  1 15:35:20 2011
New Revision: 10296

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10296
Log:
wctdm24xxp, wcte12xp: Allow VPMADT032 commands more time to complete.

Since "wctdm24xxp: Probe for and configure modules in parallel." the
check for the VPMADT032 module was moved closer to after when the
interface was initialized. The 200ms timeout did not provide enough
time for the system to settle out after initial start. The result
was that sometimes after a cold boot the driver would fail to detect
any VPMADT032 modules.

This fixes a race condition that is not in any released branches.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.c?view=diff&rev=10296&r1=10295&r2=10296
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.c Tue Nov  1 15:35:20 2011
@@ -126,8 +126,8 @@
 	unsigned long ret;
 	BUG_ON(!cmd);
 
-	/* We'll wait for 200ms */
-	ret = wait_for_completion_timeout(&cmd->complete, HZ/5);
+	/* We'll wait for 2s */
+	ret = wait_for_completion_timeout(&cmd->complete, HZ*2);
 	if (unlikely(!ret)) {
 		spin_lock_irqsave(&vpm->list_lock, flags);
 		list_del(&cmd->node);