1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 02f643456b16..0ac67bff303a 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -927,10 +927,6 @@ conf_software:
 
         /* 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 @@ conf_software:
         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;