Merged revisions 124965 via svnmerge from

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

........
r124965 | tilghman | 2008-06-24 19:46:24 -0500 (Tue, 24 Jun 2008) | 7 lines

Pvt deadlock causes some channels to get stuck in Reserved status.
(closes issue #12621)
 Reported by: fabianoheringer
 Patches: 
       20080612__bug12621.diff.txt uploaded by Corydon76 (license 14)
 Tested by: fabianoheringer

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@124966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-25 01:08:37 +00:00
parent 7ec25255c5
commit 15093f2a63
2 changed files with 23 additions and 3 deletions

View File

@@ -5196,10 +5196,11 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
int index;
void *readbuf;
struct ast_frame *f;
ast_mutex_lock(&p->lock);
while (ast_mutex_trylock(&p->lock)) {
CHANNEL_DEADLOCK_AVOIDANCE(ast);
}
index = dahdi_get_index(ast, p, 0);
/* Hang up if we don't really exist */