summaryrefslogtreecommitdiff
path: root/drivers/dahdi/dahdi_echocan_kb1.c
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2010-09-29 21:32:55 +0000
committerShaun Ruffell <sruffell@digium.com>2010-09-29 21:32:55 +0000
commit7f4bb3298186ae9749f86b60d7059c2b64d59e4a (patch)
tree80b5703309a5672f584f42a5fa8915063e4225dc /drivers/dahdi/dahdi_echocan_kb1.c
parentc44372ac1643221cb4b42e25726bdeaa57371bc3 (diff)
dahdi: Fix 'void *' pointer arithmetic warnings.
(closes issue #15927) Reported by: Max Khon Patches: dahdi_echocan2.diff uploaded by Max Khon (license 884) void2.diff uploaded by Max Khon (license 884) Signed-off-by: Kinsey Moore <kmoore@digium.com> Signed-off-by: Shaun Ruffell <sruffell@digium.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9420 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi_echocan_kb1.c')
-rw-r--r--drivers/dahdi/dahdi_echocan_kb1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dahdi/dahdi_echocan_kb1.c b/drivers/dahdi/dahdi_echocan_kb1.c
index 94f8523..7433d3e 100644
--- a/drivers/dahdi/dahdi_echocan_kb1.c
+++ b/drivers/dahdi/dahdi_echocan_kb1.c
@@ -266,7 +266,7 @@ static inline short get_cc_s(echo_can_cb_s *cb, int pos)
static inline void init_cc(struct ec_pvt *pvt, int N, int maxy, int maxu)
{
- void *ptr = pvt;
+ char *ptr = (char *) pvt;
unsigned long tmp;
/* Double-word align past end of state */
@@ -281,9 +281,9 @@ static inline void init_cc(struct ec_pvt *pvt, int N, int maxy, int maxu)
pvt->beta2_i = DEFAULT_BETA1_I;
/* Allocate coefficient memory */
- pvt->a_i = ptr;
+ pvt->a_i = (int *) ptr;
ptr += (sizeof(int) * pvt->N_d);
- pvt->a_s = ptr;
+ pvt->a_s = (short *) ptr;
ptr += (sizeof(short) * pvt->N_d);
/* Reset Y circular buffer (short version) */