[svn-commits] sruffell: branch linux/2.2 r7550 - in /linux/branches/2.2: ./ drivers/dahdi/w...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Nov 10 09:47:01 2009
New Revision: 7550

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7550
Log:
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
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/wcte12xp/base.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: linux/branches/2.2/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7550&r1=7549&r2=7550
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wcte12xp/base.c Tue Nov 10 09:47:01 2009
@@ -1179,6 +1179,11 @@
 	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);
 }