提交 c6a2e587 编写于 作者: A Andreas Eversberg 提交者: Karsten Keil

mISDN: Fix kernel crash when doing hardware conference with more than two members

Fix kernel crash when doing hardware conference with more than two members.
Removed DTMF threshold notice when debugging is disabled.
Signed-off-by: NAndreas Eversberg <andreas@eversberg.eu>
Signed-off-by: NKarsten Keil <kkeil@suse.de>
上级 c3b3cdeb
......@@ -927,10 +927,6 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
/* for more than two members.. */
/* in case of hdlc, we change to software */
if (dsp->hdlc)
goto conf_software;
/* if all members already have the same conference */
if (all_conf)
return;
......@@ -941,6 +937,9 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
if (current_conf >= 0) {
join_members:
list_for_each_entry(member, &conf->mlist, list) {
/* in case of hdlc, change to software */
if (member->dsp->hdlc)
goto conf_software;
/* join to current conference */
if (member->dsp->hfc_conf == current_conf)
continue;
......
......@@ -301,8 +301,9 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
if (dsp_debug & DEBUG_DSP_CORE)
printk(KERN_DEBUG "%s: start dtmf\n", __func__);
if (len == sizeof(int)) {
printk(KERN_NOTICE "changing DTMF Threshold "
"to %d\n", *((int *)data));
if (dsp_debug & DEBUG_DSP_CORE)
printk(KERN_NOTICE "changing DTMF Threshold "
"to %d\n", *((int *)data));
dsp->dtmf.treshold = (*(int *)data) * 10000;
}
/* init goertzel */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册