diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-01-21 05:30:25 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-01-21 05:30:25 +0000 |
| commit | b7dac9478e6b3a1bd0a9467b23a2a3fd9e591587 (patch) | |
| tree | 56cbc90f7408433b5a313938820384b73f9f9aac | |
| parent | 39eaeaea43228f5a30df01129a3bf362e5ad9ed3 (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>
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
| -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 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; |