Revert patch committed for issue #9660. It broke E&M trunks.

(closes issue #10360)
(closes issue #10364)

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b61a9c28c4b71f67a1b458eed393849a47e4adfe..8589de4323be8a8448e164d74b5a4f67423f3001 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1726,20 +1726,14 @@ static int restore_gains(struct zt_pvt *p)
 
 static inline int zt_set_hook(int fd, int hs)
 {
-       int x, res, count = 0;
+       int x, res;
 
        x = hs;
        res = ioctl(fd, ZT_HOOK, &x);
 
-       while (res < 0 && count < 20) {
-               usleep(100000); /* 1/10 sec. */
-               x = hs;
-               res = ioctl(fd, ZT_HOOK, &x);
-               count++;
-       }
-
        if (res < 0) {
-               if (errno == EINPROGRESS) return 0;
+               if (errno == EINPROGRESS)
+                       return 0;
                ast_log(LOG_WARNING, "zt hook failed: %s\n", strerror(errno));
        }