summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-10-02 20:31:58 +0000
committersruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-10-02 20:31:58 +0000
commit29de7a2faa449d5e09a29facd5cf2d77d2607619 (patch)
tree82ee662a22d5998efa9ff7f9444a22d7941ee09d
parentc11e787aa8114fb91797a70e8e89508875c63001 (diff)
Mark that there is not any data waiting whenever we cleanup the private
channel structures. Issue: DAHDI-42 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4551 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--kernel/wctc4xxp/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/wctc4xxp/base.c b/kernel/wctc4xxp/base.c
index 0f72511..7476bd9 100644
--- a/kernel/wctc4xxp/base.c
+++ b/kernel/wctc4xxp/base.c
@@ -1440,6 +1440,7 @@ wctc4xxp_cleanup_channel_private(struct wcdte *wc, struct channel_pvt *cpvt)
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 @@ do_channel_allocate(struct zt_transcoder_channel *dtc)
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);