diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-02-19 21:26:55 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-02-19 21:26:55 +0000 |
| commit | 05cc6d6d55a3733ee3badf5605cabb7e7ef13554 (patch) | |
| tree | bfbb81a8e2ef3c25e3116a7eb582655caed2d75a /channels/chan_dahdi.c | |
| parent | 252aee4228da62d1e0c9859413d692bd75e3420f (diff) | |
chan_dahdi: Remove some dead code.
........
Merged revisions 431992 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 431993 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 10b6295cd..72c8497f0 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1423,7 +1423,8 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int for (;;) { i = DAHDI_IOMUX_READ | DAHDI_IOMUX_SIGEVENT; - if ((res = ioctl(p->subs[idx].dfd, DAHDI_IOMUX, &i))) { + res = ioctl(p->subs[idx].dfd, DAHDI_IOMUX, &i); + if (res) { ast_log(LOG_WARNING, "I/O MUX failed: %s\n", strerror(errno)); ast_hangup(chan); return 1; @@ -1458,7 +1459,6 @@ static int my_distinctive_ring(struct ast_channel *chan, void *pvt, int idx, int } if (analog_p->ringt > 0) { if (!(--analog_p->ringt)) { - res = -1; break; } } |