diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2010-11-08 22:33:01 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2010-11-08 22:33:01 +0000 |
| commit | 9a257b9f9708d9efb542bf989215236b5bbbf94b (patch) | |
| tree | cbdb44b50d72de6129476fa7331010e525bb5f06 /res/res_timing_timerfd.c | |
| parent | 12a40275f2ca61d45114aa8d6c75506a6401a17b (diff) | |
Merged revisions 294313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r294313 | jpeeler | 2010-11-08 16:32:13 -0600 (Mon, 08 Nov 2010) | 9 lines
Merged revisions 294312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r294312 | jpeeler | 2010-11-08 16:30:49 -0600 (Mon, 08 Nov 2010) | 1 line
add missing unlock not present in 294277
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_timing_timerfd.c')
| -rw-r--r-- | res/res_timing_timerfd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c index c9922aabe..438603b55 100644 --- a/res/res_timing_timerfd.c +++ b/res/res_timing_timerfd.c @@ -228,6 +228,7 @@ static int timerfd_timer_disable_continuous(int handle) /* No reason to do anything if we're not * in continuous mode */ + ao2_unlock(our_timer); ao2_ref(our_timer, -1); return 0; } |