diff options
author | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-08 19:28:05 +0000 |
---|---|---|
committer | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-08 19:28:05 +0000 |
commit | 86196653676b38fee4496b1a3452891078cd140e (patch) | |
tree | b01f687f3c4a75ba0b07e1743a8485ed1a6fb520 /channels/chan_agent.c | |
parent | be5bc57ec1879c19c4d1b42c0407fe1454b0654b (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_agent.c')
-rwxr-xr-x | channels/chan_agent.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index c12a8581a..f5c4e3a51 100755 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -383,16 +383,14 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f) static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct agent_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); ast_mutex_unlock(&p->lock); return -1; } p->owner = newchan; - if (needlock) - ast_mutex_unlock(&p->lock); + ast_mutex_unlock(&p->lock); return 0; } |