dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
russell 2007-08-07 17:46:00 +00:00
parent 5c63d5ac16
commit a4b09e8d28
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
channels/chan_zap.c
View File

@ -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));
}