[svn-commits] sruffell: linux/trunk r9549 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Dec 21 10:09:27 2010
New Revision: 9549

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9549
Log:
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 at digium.com>
Acked-by: Russ Meyerreicks <rmeyerreicks at digium.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9549&r1=9548&r2=9549
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Tue Dec 21 10:09:27 2010
@@ -1288,7 +1288,6 @@
 	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 @@
 	might_sleep();
 
 	spin_lock_init(&chan->lock);
+	init_waitqueue_head(&chan->waitq);
 	if (!chan->master)
 		chan->master = chan;
 	if (!chan->readchunk)
@@ -2595,8 +2595,6 @@
 	/* Initialize RBS timers */
 	chan->itimerset = chan->itimer = chan->otimer = 0;
 	chan->ringdebtimer = 0;
-
-	init_waitqueue_head(&chan->waitq);
 
 	/* Reset conferences */
 	reset_conf(chan);