diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 17:44:04 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 17:44:04 +0000 |
| commit | 27ee0af2acecfd78843d26d8f087612755883aed (patch) | |
| tree | 539d6f7205a9878e1e89391a39c35afb68b47a77 | |
| parent | 7487925f29c2c6b126749d7887a4c4f06c215370 (diff) | |
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/branches/1.2@78370 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_zap.c | 12 |
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)); } |