Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6a2e587 authored by Andreas Eversberg's avatar Andreas Eversberg Committed by Karsten Keil
Browse files

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: default avatarAndreas Eversberg <andreas@eversberg.eu>
Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
parent c3b3cdeb

drivers/isdn/mISDN/dsp_cmx.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

drivers/isdn/mISDN/dsp_core.c

+3 −2
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ 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)) {

			if (dsp_debug & DEBUG_DSP_CORE)

				printk(KERN_NOTICE "changing DTMF Threshold "

					"to %d\n", *((int *)data));

			dsp->dtmf.treshold = (*(int *)data) * 10000;