From e44bfeae289af2f7d21e016a0041c9a89fc6120a Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 7 Jul 2008 19:36:57 +0000 Subject: wctdm_initialize expects the channels to already be allocated. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4558 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctdm24xxp/base.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'drivers/dahdi/wctdm24xxp/base.c') diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 1fa8868..bb229e2 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -3809,6 +3809,15 @@ retry: init_waitqueue_head(&wc->regq); + for (i = 0; i < wc->cards; i++) { + if (!(wc->chans[i] = kmalloc(sizeof(*wc->chans[i]), GFP_KERNEL))) { + free_wc(wc); + return -ENOMEM; + } + memset(wc->chans[i], 0, sizeof(*wc->chans[i])); + } + + if (wctdm_initialize(wc)) { voicebus_release(wc->vb); wc->vb = NULL; @@ -3843,14 +3852,6 @@ retry: /* Final initialization */ wctdm_post_initialize(wc); - for (i = 0; i < wc->cards; i++) { - if (!(wc->chans[i] = kmalloc(sizeof(*wc->chans[i]), GFP_KERNEL))) { - free_wc(wc); - return -ENOMEM; - } - memset(wc->chans[i], 0, sizeof(*wc->chans[i])); - } - /* We should be ready for DAHDI to come in now. */ if (dahdi_register(&wc->span, 0)) { printk("Unable to register span with DAHDI\n"); -- cgit v1.2.3