--- a/bluetooth/btstack/l2cap/l2signalmgr.cpp	Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2signalmgr.cpp	Wed Oct 13 15:48:34 2010 +0300
@@ -1177,11 +1177,11 @@
 		else
 			{
 			TBool controllerAdded = EFalse;
-			while(!controllerAdded && (handler = iter++) != NULL)
+			while((handler = iter++) != NULL && !controllerAdded)
 				{
 				if(channelPriority > handler->Config().ChannelPriority())
 					{
-					aDataController.iLink.AddBefore(&handler->iLink);
+					handler->iLink.AddBefore(&(aDataController.iLink));
 					controllerAdded = ETrue;
 					}
 				}