diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-12-21 16:09:27 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-12-21 16:09:27 +0000 |
| commit | 90fcb5a4c3619f67cc5f696f68c00d22931c6266 (patch) | |
| tree | 7cf22e87a29378174b0dce64b450748458aa4921 /drivers | |
| parent | 12d5353bb851dcd5e7b4d8538454c01f97615e99 (diff) | |
dahdi: Initialize chan->waitq once at registration time.
This is instead of initializing the waitq each time the channel is
opened or closed.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Russ Meyerreicks <rmeyerreicks@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9549 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 3f4bcae..f26eab9 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -1288,7 +1288,6 @@ static void close_channel(struct dahdi_chan *chan) chan->pulsecount = 0; chan->pulsetimer = 0; chan->ringdebtimer = 0; - init_waitqueue_head(&chan->waitq); chan->txdialbuf[0] = '\0'; chan->digitmode = DIGIT_MODE_DTMF; chan->dialing = 0; @@ -1564,6 +1563,7 @@ static int dahdi_chan_reg(struct dahdi_chan *chan) might_sleep(); spin_lock_init(&chan->lock); + init_waitqueue_head(&chan->waitq); if (!chan->master) chan->master = chan; if (!chan->readchunk) @@ -2596,8 +2596,6 @@ static int initialize_channel(struct dahdi_chan *chan) chan->itimerset = chan->itimer = chan->otimer = 0; chan->ringdebtimer = 0; - init_waitqueue_head(&chan->waitq); - /* Reset conferences */ reset_conf(chan); |