From a4b09e8d28ad6e5a3a51b8fbb1771ad7e654463c Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 7 Aug 2007 17:46:00 +0000 Subject: [PATCH] Merged revisions 78371 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r78371 | russell | 2007-08-07 12:45:30 -0500 (Tue, 07 Aug 2007) | 12 lines Merged revisions 78370 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r78370 | russell | 2007-08-07 12:44:04 -0500 (Tue, 07 Aug 2007) | 4 lines Revert patch committed for issue #9660. It broke E&M trunks. (closes issue #10360) (closes issue #10364) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@78372 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_zap.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 8695aa5a1..747001481 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1757,20 +1757,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)); }