From a97c27fc27267313eeff71c3437d88b71814264d Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Tue, 7 Aug 2007 18:44:16 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@78412 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- 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 b61a9c28c4..8589de4323 100644 --- 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)); }