diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 23:57:42 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-06 23:57:42 +0000 |
| commit | 5a53eae78daf1d7e317fbcc30f4da304f4024eb4 (patch) | |
| tree | eec15ad06827bf4f9905be89e67ac26b408227e7 | |
| parent | 70819f7f5febd6d6dac7bcc468c805c8c8fa4237 (diff) | |
Merged revisions 222463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r222463 | jpeeler | 2009-10-06 18:56:01 -0500 (Tue, 06 Oct 2009) | 14 lines
Merged revisions 222462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r222462 | jpeeler | 2009-10-06 18:51:19 -0500 (Tue, 06 Oct 2009) | 8 lines
Add missing unlock(s) in dahdi_read
(two cases in trunk)
(closes issue #15683)
Reported by: alecdavis
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@222464 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 8d17d6e9f..9db9b57d0 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5682,7 +5682,10 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) return NULL; } - if ((p->radio || (p->oprmode < 0)) && p->inalarm) return NULL; + if ((p->radio || (p->oprmode < 0)) && p->inalarm) { + ast_mutex_unlock(&p->lock); + return NULL; + } p->subs[index].f.frametype = AST_FRAME_NULL; p->subs[index].f.datalen = 0; |