And as a followup to revision 104026, completely remove event-related

calls from a section of code where we know there was no event to handle or get.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@104027 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 8e1a275b73026c2389449bf702d6b540175be19e..3c0ad0e9af15d25185f14be097a51f603062b007 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6938,10 +6938,6 @@ static void *do_monitor(void *data)
                                        } else {
                                                ast_log(LOG_WARNING, "Read failed with %d: %s\n", res, strerror(errno));
                                        }
-                                       /* Don't hold iflock while handling init events -- race with chlock */
-                                       ast_mutex_unlock(&iflock);
-                                       handle_init_event(i, res);
-                                       ast_mutex_lock(&iflock);        
                                }
                                if (pollres & POLLPRI) {
                                        if (i->owner || i->subs[SUB_REAL].owner) {