diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-04-05 18:47:11 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-04-05 18:47:11 +0000 |
| commit | 698a356737bc396c967202feb2620979f1596694 (patch) | |
| tree | 6b605e7c36fc7beaf76b3e239839e89e124cd763 /channels/chan_dahdi.c | |
| parent | ad30fa75692f92d72be81133de789c6a27d50233 (diff) | |
Merged revisions 312949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r312949 | rmudgett | 2011-04-05 13:45:24 -0500 (Tue, 05 Apr 2011) | 6 lines
Crash if ISDN span layer 1 is down on initial load.
Regression from -r312575 B channel shifting during negotiation.
* Also combine updating the alarm flag with clearing the resetting flag.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index e1c4a26bc..04105ad59 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12757,9 +12757,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, switch (tmp->sig) { #ifdef HAVE_PRI case SIG_PRI_LIB_HANDLE_CASES: - ast_mutex_lock(&tmp->lock); - sig_pri_chan_alarm_notify(tmp->sig_pvt, si.alarms); - ast_mutex_unlock(&tmp->lock); + sig_pri_set_alarm(tmp->sig_pvt, !si.alarms); break; #endif #if defined(HAVE_SS7) |