diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-10-25 18:26:17 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-10-25 18:26:17 +0000 |
| commit | bfe7f5196875efdb000b5f5c0e43dc1c78fc3689 (patch) | |
| tree | 494315b51e2336af63d2ae56d3302009b2e9072d /drivers/dahdi/wctdm24xxp/base.c | |
| parent | 0db04ecbba0e20f7b9236fc610c663eaca832b8e (diff) | |
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@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9456 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp/base.c')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 38ff18c..4fc2a42 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; |