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

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Nov 19 13:15:55 2009
New Revision: 7604

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7604
Log:
Merged revisions 7601 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r7601 | sruffell | 2009-11-19 10:11:20 -0600 (Thu, 19 Nov 2009) | 1 line
  
  wctdm24xxp: Honor the alawoverride parameter when using the VPMADT032.
........

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

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

Modified: linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=7604&r1=7603&r2=7604
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wctdm24xxp/base.c Thu Nov 19 13:15:55 2009
@@ -416,6 +416,9 @@
 		printk(KERN_NOTICE "Error pinging DSP (%d)\n", res);
 		return -1;
 	}
+
+	vpm->companding = (wc->span.deflaw == DAHDI_LAW_MULAW) ?
+				ADT_COMP_ULAW : ADT_COMP_ALAW;
 
 	for (i = 0; i < vpm->options.channels; ++i) {
 		vpm->curecstate[i].tap_length = 0;