Merged revisions 285017 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285017 | twilson | 2010-09-03 18:19:54 -0500 (Fri, 03 Sep 2010) | 4 lines
  
  Call correct lock function as transferer is a sip_pvt not a channel
  
  Both functions are #defined to ao2_lock, but still...
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@285029 f38db490-d61c-443f-a65b-d21fe96a405b

Author: twilson

channels/chan_sip.c

@@ -21767,7 +21767,7 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 
 		ast_do_masquerade(target.chan1);
 
-		ast_channel_lock(transferer); /* the transferer pvt is expected to remain locked on return */
+		sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
 
 		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);