From aeb716625a0fcff5f80a048bedcb6509025ac1f8 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 21 Jan 2011 05:30:25 +0000 Subject: [PATCH] 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 Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9456 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9675 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctdm24xxp/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 4cf90b4..f3ec832 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -2261,7 +2261,7 @@ static int wctdm_proslic_insane(struct wctdm *wc, int card) /* 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;