[zaptel-commits] sruffell: branch 1.4 r4551 - /branches/1.4/kernel/wctc4xxp/base.c

[SVN commits to the Zaptel project]

Author: sruffell
Date: Thu Oct  2 15:31:58 2008
New Revision: 4551

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4551
Log:
Mark that there is not any data waiting whenever we cleanup the private
channel structures.
Issue: DAHDI-42

Modified:
    branches/1.4/kernel/wctc4xxp/base.c

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=4551&r1=4550&r2=4551
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Thu Oct  2 15:31:58 2008
@@ -1440,6 +1440,7 @@
 
 	spin_lock_bh(&cpvt->lock);
 	list_splice_init(&cpvt->rx_queue, &local_list);
+	zt_tc_clear_data_waiting(dtc);
 	spin_unlock_bh(&cpvt->lock);
 
 	list_for_each_entry_safe(cmd, temp, &local_list, node) {
@@ -1492,7 +1493,6 @@
 	DTE_DEBUG(DTE_DEBUG_CHANNEL_SETUP, 
 	          "Entering %s for channel %p.\n", __FUNCTION__, dtc);
 	/* Anything on the rx queue now is old news... */
-	zt_tc_clear_data_waiting(dtc);
 	wctc4xxp_cleanup_channel_private(wc, cpvt);
 	DTE_DEBUG(DTE_DEBUG_CHANNEL_SETUP, "Allocating a new channel: %p.\n", dtc);
 	wctc4xxp_srcfmt = wctc4xxp_zapfmt_to_dtefmt(dtc->srcfmt);