aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authorcitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-04-08 19:28:05 +0000
committercitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-04-08 19:28:05 +0000
commit86196653676b38fee4496b1a3452891078cd140e (patch)
treeb01f687f3c4a75ba0b07e1743a8485ed1a6fb520 /channels/chan_h323.c
parentbe5bc57ec1879c19c4d1b42c0407fe1454b0654b (diff)
Hopefully the last round of removing needlock stuff
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2663 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
-rwxr-xr-xchannels/chan_h323.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index ca68cb681..b29f6977b 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -626,15 +626,13 @@ static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{
struct oh323_pvt *p = newchan->pvt->pvt;
- if (needlock)
- ast_mutex_lock(&p->lock);
+ ast_mutex_lock(&p->lock);
if (p->owner != oldchan) {
ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
return -1;
}
p->owner = newchan;
- if (needlock)
- ast_mutex_unlock(&p->lock);
+ ast_mutex_unlock(&p->lock);
return 0;
}