diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-11-10 15:47:01 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-11-10 15:47:01 +0000 |
| commit | ecb48ce630aaf4754efb4159e4d9b8256f26148d (patch) | |
| tree | f3d352cd25ed4cbb882d17cc40ccc786c4317665 | |
| parent | da8d67d043e0a2146c4ce1f2c153d99ef206526b (diff) | |
Merged revisions 7549 via svnmerge from
https://origsvn.digium.com/svn/dahdi/linux/trunk
........
r7549 | sruffell | 2009-11-10 09:46:18 -0600 (Tue, 10 Nov 2009) | 9 lines
wcte12xp: Export features and operations for VPMADT032.
Fixes a regression in dahdi-linux 2.2.0 where it was impossible for userspace to
reset the state of a channel in the VPM.
(issue #15724)
Patches:
mantis-15724-2.patch uploaded by sruffell (license 456)
Tested by: alecdavis
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7550 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 80365f3..c4856ca 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1179,6 +1179,11 @@ static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *e if (!wc->vpmadt032) { return -ENODEV; } + + *ec = wc->ec[chan->chanpos - 1]; + (*ec)->ops = &vpm150m_ec_ops; + (*ec)->features = vpm150m_ec_features; + return vpmadt032_echocan_create(wc->vpmadt032, chan->chanpos - 1, ecp, p); } |