summaryrefslogtreecommitdiff
path: root/channels/dahdi/bridge_native_dahdi.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels/dahdi/bridge_native_dahdi.c')
-rw-r--r--channels/dahdi/bridge_native_dahdi.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/channels/dahdi/bridge_native_dahdi.c b/channels/dahdi/bridge_native_dahdi.c
index 7505eca3e..74b912fe8 100644
--- a/channels/dahdi/bridge_native_dahdi.c
+++ b/channels/dahdi/bridge_native_dahdi.c
@@ -578,18 +578,17 @@ static int native_bridge_join(struct ast_bridge *bridge, struct ast_bridge_chann
bridge_channel->tech_pvt = tech_pvt;
native_request_start(bridge);
+ /*
+ * Make the channels compatible in case the native bridge did
+ * not start for some reason and we need to fallback to 1-1
+ * bridging.
+ */
c0 = AST_LIST_FIRST(&bridge->channels)->chan;
c1 = AST_LIST_LAST(&bridge->channels)->chan;
- if (c0 != c1) {
- /*
- * Make the channels compatible in case the native bridge did
- * not start for some reason and we need to fallback to 1-1
- * bridging.
- */
- ast_channel_make_compatible(c0, c1);
+ if (c0 == c1) {
+ return 0;
}
-
- return 0;
+ return ast_channel_make_compatible(c0, c1);
}
/*!