[svn-commits] sruffell: linux/trunk r9456 - /linux/trunk/drivers/dahdi/wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Oct 25 13:26:17 2010
New Revision: 9456

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9456
Log:
wctdm24xxp: Detect FXS modules based on the 3210 SLIC.

Fixes a regression introduced in revision 5916 where FXS modules based
on the 3210 were not properly detected.

(closes issue #18184)
Reported by: bsexton
Patches:
      dahdi-fxo-detect.diff uploaded by bsexton (license 1133)

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

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9456&r1=9455&r2=9456
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Mon Oct 25 13:26:17 2010
@@ -2261,7 +2261,7 @@
 
 	/* let's be really sure this is an FXS before we continue */
 	reg1 = wctdm_getreg(wc, card, 1);
-	if ((0x80 != (blah & 0xf0)) || (0x88 != reg1)) {
+	if ((0x80 != (blah & 0xf0)) || ((0x88 != reg1) && (0x08 != reg1))) {
 		if (debug & DEBUG_CARD)
 			dev_info(&wc->vb.pdev->dev, "DEBUG: not FXS b/c reg0=%x or reg1 != 0x88 (%x).\n", blah, reg1);
 		return -1;