[svn-commits] rmudgett: trunk r401031 - in /trunk: ./ channels/dahdi/bridge_native_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Oct 15 15:26:13 2013
New Revision: 401031

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401031
Log:
bridge_native_dahdi: Return channel join failure if could not make the channels compatible.
........

Merged revisions 401030 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/channels/dahdi/bridge_native_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/channels/dahdi/bridge_native_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/dahdi/bridge_native_dahdi.c?view=diff&rev=401031&r1=401030&r2=401031
==============================================================================
--- trunk/channels/dahdi/bridge_native_dahdi.c (original)
+++ trunk/channels/dahdi/bridge_native_dahdi.c Tue Oct 15 15:26:13 2013
@@ -578,18 +578,17 @@
 	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);
-	}
-
-	return 0;
+	if (c0 == c1) {
+		return 0;
+	}
+	return ast_channel_make_compatible(c0, c1);
 }
 
 /*!