# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1406341433 -28800
# Node ID 9969cee83d0a33ada3dd44e89ffb0088884e6016
# Parent  185b241a0b4a4dd495abf2af30f294611565283f# Parent  2e402a09e21ea1181cd7dec7065c2821e47dabf4
merge

diff -r 185b241a0b4a -r 9969cee83d0a common-channel.c
--- a/common-channel.c	Fri Jul 25 22:23:50 2014 +0800
+++ b/common-channel.c	Sat Jul 26 10:23:53 2014 +0800
@@ -1089,6 +1089,7 @@
 		if (ret > 0) {
 			remove_channel(channel);
 			TRACE(("inithandler returned failure %d", ret))
+			return;
 		}
 	}