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

diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index c9922aabef6ef5d9ea6fe8d1e159b8a4a8fd41e3..438603b556deea703f78ee9c62cb9f23e11aa937 100644 (file)
--- 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;
        }