diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-10-26 00:09:28 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-10-26 00:09:28 +0000 |
commit | c35c3255a0e3edac2b2bfe7a4975024bb791a033 (patch) | |
tree | 19b83ee485bb1d52f4df6d7e0c6a278fa5f85cb8 /wctdm.c | |
parent | 36a555dbd329453a9c60c76081ae34090d524fa6 (diff) |
Merged revisions 1536 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1536 | kpfleming | 2006-10-25 19:03:22 -0500 (Wed, 25 Oct 2006) | 15 lines
Merged revisions 1534-1535 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1534 | kpfleming | 2006-10-25 18:54:41 -0500 (Wed, 25 Oct 2006) | 2 lines
do ProSLIC 3215 check properly
........
r1535 | kpfleming | 2006-10-25 19:00:31 -0500 (Wed, 25 Oct 2006) | 2 lines
do ProSLIC 3215 check properly in this driver too
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1537 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctdm.c')
-rw-r--r-- | wctdm.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1189,10 +1189,10 @@ static int wctdm_proslic_insane(struct wctdm *wc, int card) printk("ProSLIC 3210 version %d is too old\n", blah & 0xf); return -1; } - if ((blah & 0xf) == 2) { + if (wctdm_getreg(wc, card, 1) & 0x80) /* ProSLIC 3215, not a 3210 */ wc->flags[card] |= FLAG_3215; - } + blah = wctdm_getreg(wc, card, 8); if (blah != 0x2) { printk("ProSLIC on module %d insane (1) %d should be 2\n", card, blah); |