From ce261cd03a4d893c216a03525eef3c3ee1087346 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 1 Nov 2011 20:35:20 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10296 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/voicebus/GpakCust.c | 4 ++-- 1 file 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);