summaryrefslogtreecommitdiff
path: root/channels/chan_dahdi.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels/chan_dahdi.c')
-rw-r--r--channels/chan_dahdi.c4
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;
}
}