From: Jeff Peeler <jpeeler@digium.com>
Date: Mon, 8 Nov 2010 22:32:13 +0000 (+0000)
Subject: Merged revisions 294312 via svnmerge from
X-Git-Tag: 1.8.1-rc1~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b12f27f231b7a5d37dfd4d5c3a0881461f87e578;p=thirdparty%2Fasterisk.git

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/branches/1.8@294313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index c9922aabef..438603b556 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;
 	}