From 0effac1e66370bcb750c9709bb203cd68ead2c50 Mon Sep 17 00:00:00 2001 From: Jeff Peeler <jpeeler@digium.com> Date: Fri, 18 Jun 2010 18:36:55 +0000 Subject: [PATCH] Recorded merge of revisions 271335 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r271335 | jpeeler | 2010-06-18 13:33:17 -0500 (Fri, 18 Jun 2010) | 13 lines Eliminate deadlock potential in dahdi_fixup(). (This is a backport of 269307, committed to trunk by rmudgett.) Calling dahdi_indicate() when the channel private lock is already held can cause a deadlock if the PRI lock is needed because dahdi_indicate() will also get the channel private lock. The pri_grab() function assumes that the channel private lock is held once to avoid deadlock. (closes issue #17261) Reported by: aragon ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271336 65c4cc65-6c06-0410-ace0-fbb531ad65f3 -- GitLab