[dahdi-commits] sruffell: branch linux/2.6 r10415 - /linux/branches/2.6/drivers/dahdi/wctdm24...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Tue Jan 10 16:05:43 2012
New Revision: 10415

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10415
Log:
wctdm24xxp: FXS on-hook transmission timer incorrect.

The DAHDI_ONHOOKTRANSFER ioctl was incorrectly setting the ohttimer to 0. The
result was that an FXS port was leaving the on-hook transfer state before
finishing the transmission.

This was discovered while looking at why ./fxstest dtmfcid  was not able to
pass the DTMF callerid digits to an attached FXO port properly.

Fixes a regression introduced in r10167 "wctdm24xxp: Use interval for checking
FXS on hook transfer timer." [1], first released in 2.6.0.

[1] http://svnview.digium.com/svn/dahdi?view=revision&revision=10167

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

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10413

Modified:
    linux/branches/2.6/drivers/dahdi/wctdm24xxp/base.c

Modified: linux/branches/2.6/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10415&r1=10414&r2=10415
==============================================================================
--- linux/branches/2.6/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/branches/2.6/drivers/dahdi/wctdm24xxp/base.c Tue Jan 10 16:05:43 2012
@@ -3727,14 +3727,15 @@
 
 		if (((fxs->lasttxhook & SLIC_LF_SETMASK) == SLIC_LF_ACTIVE_FWD) ||
 		    ((fxs->lasttxhook & SLIC_LF_SETMASK) == SLIC_LF_ACTIVE_REV)) {
-
-			x = set_lasttxhook_interruptible(wc, fxs,
+			int res;
+
+			res = set_lasttxhook_interruptible(wc, fxs,
 				(POLARITY_XOR(fxs) ?
 				SLIC_LF_OHTRAN_REV : SLIC_LF_OHTRAN_FWD),
 				&mod->sethook);
 
 			if (debug & DEBUG_CARD) {
-				if (x) {
+				if (res) {
 					dev_info(&wc->vb.pdev->dev,
 						 "Channel %d TIMEOUT: "
 						 "OnHookTransfer start\n",