diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-20 22:40:11 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-20 22:40:11 +0000 |
| commit | d653250809bfefc4427705e3d9fe45c54586ccf3 (patch) | |
| tree | 8b22eb3a57540633e0f0c783a8a9c79e7d49bd9e /drivers/dahdi/fir.h | |
| parent | a8cc1e7138795a0ea33afea701317c1d6054a84d (diff) | |
merge modular_ec branch, which adds modular echocan support and lots of minor fixes and improvements... seems to work properly, except the usecount on the echocan modules never increments above zero, so they are unloadable when they should not be
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4436 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/fir.h')
| -rw-r--r-- | drivers/dahdi/fir.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dahdi/fir.h b/drivers/dahdi/fir.h index 1722285..ee8cffe 100644 --- a/drivers/dahdi/fir.h +++ b/drivers/dahdi/fir.h @@ -51,7 +51,7 @@ static inline void fir16_create (fir16_state_t *fir, fir->taps = taps; fir->curr_pos = taps - 1; fir->coeffs = coeffs; - fir->history = MALLOC (taps*sizeof (int16_t)); + fir->history = kmalloc(taps*sizeof (int16_t), GFP_KERNEL); if (fir->history) memset (fir->history, '\0', taps*sizeof (int16_t)); } @@ -59,7 +59,7 @@ static inline void fir16_create (fir16_state_t *fir, static inline void fir16_free (fir16_state_t *fir) { - FREE (fir->history); + kfree(fir->history); } /*- End of function --------------------------------------------------------*/ @@ -92,7 +92,7 @@ static inline void fir32_create (fir32_state_t *fir, fir->taps = taps; fir->curr_pos = taps - 1; fir->coeffs = coeffs; - fir->history = MALLOC (taps*sizeof (int16_t)); + fir->history = kmalloc(taps*sizeof (int16_t), GFP_KERNEL); if (fir->history) memset (fir->history, '\0', taps*sizeof (int16_t)); } @@ -100,7 +100,7 @@ static inline void fir32_create (fir32_state_t *fir, static inline void fir32_free (fir32_state_t *fir) { - FREE (fir->history); + kfree(fir->history); } /*- End of function --------------------------------------------------------*/ |