aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-07 18:44:16 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-07 18:44:16 +0000
commitc7e14a4afb1176bc4de887f98bf18160407f25f1 (patch)
tree0181e2345efbfe2a9c59984870f0fd0c416db620
parente4950dbde5dce652013ea079ee021043cbda06ef (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@78412 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_zap.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b61a9c28c..8589de432 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));
}