diff options
| author | Karsten Keil <keil@b1-systems.de> | 2009-05-22 13:04:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 09:55:30 +0200 |
| commit | db9bb63a1b5b65df41d112a8c21adbbfc6a4ac08 (patch) | |
| tree | 1a817cf2b57f557346d3f436aa12e0d10a918d42 /drivers/isdn/mISDN | |
| parent | mISDN: Fix skb leak in error cases (diff) | |
| download | linux-db9bb63a1b5b65df41d112a8c21adbbfc6a4ac08.tar.xz linux-db9bb63a1b5b65df41d112a8c21adbbfc6a4ac08.zip | |
mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti
New version without emulating arch specific stuff for the other
architectures, the special IO and init functions for the 8xx
microcontroller are in a separate include file.
Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/mISDN')
| -rw-r--r-- | drivers/isdn/mISDN/dsp_cmx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index d19b4f6d7d87..05866184ba23 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c @@ -947,6 +947,10 @@ conf_software: if (current_conf >= 0) { join_members: list_for_each_entry(member, &conf->mlist, list) { + /* if no conference engine on our chip, change to + * software */ + if (!member->dsp->features.hfc_conf) + goto conf_software; /* in case of hdlc, change to software */ if (member->dsp->hdlc) goto conf_software; |