[svn-commits] sruffell: linux/trunk r5007 - /linux/trunk/drivers/dahdi/wctdm.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Sun Sep 28 12:29:12 2008
New Revision: 5007

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5007
Log:
Improve reliablity of UK caller ID for the TDM400P by not allowing the
ringdebounce to be decremented when it is at 0 already.

Related to issue #12531.  Reported mattbrown, fix suggested by benbrown.

Modified:
    linux/trunk/drivers/dahdi/wctdm.c

Modified: linux/trunk/drivers/dahdi/wctdm.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm.c?view=diff&rev=5007&r1=5006&r2=5007
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm.c (original)
+++ linux/trunk/drivers/dahdi/wctdm.c Sun Sep 28 12:29:12 2008
@@ -771,7 +771,8 @@
 	if (!fxo->offhook) {
 		if (fwringdetect) {
 			res = wc->reg0shadow[card] & 0x60;
-			if (fxo->ringdebounce--) {
+			if (fxo->ringdebounce) {
+				--fxo->ringdebounce;
 				if (res && (res != fxo->lastrdtx) &&
 				    (fxo->battery == BATTERY_PRESENT)) {
 					if (!fxo->wasringing) {