diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 17:45:30 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-07 17:45:30 +0000 |
| commit | 502985569bfa8419895fbb47a5054829f883db26 (patch) | |
| tree | a7c38e0ed472d2a7a7b68da841504ce32c3c4ad3 /channels | |
| parent | e0893dde3a403ad50e704db40c4c01069161ca81 (diff) | |
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/branches/1.4@78371 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 da3454b0f..d6d16de6e 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1607,20 +1607,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)); } |