[svn-commits] sruffell: branch linux/sruffell/chan_list_refactoring r9304 - /linux/team/sru...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Sun Sep  5 13:04:39 2010
New Revision: 9304

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9304
Log:
dahdi-squash: Remove another "gainalloc" reference.

Missed this one when CONFIG_PPP is defined.  This commit should be squashed
with the other one before committing to trunk.

Modified:
    linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c

Modified: linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c?view=diff&rev=9304&r1=9303&r2=9304
==============================================================================
--- linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/sruffell/chan_list_refactoring/drivers/dahdi/dahdi-base.c Sun Sep  5 13:04:39 2010
@@ -5747,11 +5747,10 @@
 					ec_current = chan->ec_current;
 					chan->ec_current = NULL;
 					/* Make sure there's no gain */
-					if (chan->gainalloc)
+					if (is_gain_allocated(chan))
 						kfree(chan->rxgain);
 					chan->rxgain = defgain;
 					chan->txgain = defgain;
-					chan->gainalloc = 0;
 					chan->flags &= ~DAHDI_FLAG_AUDIO;
 					chan->flags |= (DAHDI_FLAG_PPP | DAHDI_FLAG_HDLC | DAHDI_FLAG_FCS);