summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-11-01 20:35:20 +0000
committerShaun Ruffell <sruffell@digium.com>2011-11-01 20:35:20 +0000
commit8ebb85f5531c9aca9fd7a937f4ba6d0e3b23060a (patch)
tree59ba57f5d71c5291bf44a69164547bda994fcc42
parenteef9b60835fde38ebc4c1a34a96dc7df92227b8a (diff)
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@digium.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10296 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/voicebus/GpakCust.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/voicebus/GpakCust.c b/drivers/dahdi/voicebus/GpakCust.c
index ebd60da..271b631 100644
--- a/drivers/dahdi/voicebus/GpakCust.c
+++ b/drivers/dahdi/voicebus/GpakCust.c
@@ -126,8 +126,8 @@ static int vpmadt032_getreg_full_return(struct vpmadt032 *vpm, int pagechange,
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);