diff options
Diffstat (limited to 'drivers/dahdi/dahdi-base.c')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 1fa06d5..84b9528 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -922,12 +922,14 @@ static void dahdi_check_conf(int x) return; for (y = 0; y < maxchans; y++) { - if (chans[y] && (chans[y]->confna == x) && - ((chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONF || - (chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONFANN || - (chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONFMON || - (chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_CONFANNMON || - (chans[y]->confmode & DAHDI_CONF_MODE_MASK) == DAHDI_CONF_REALANDPSEUDO)) { + struct dahdi_chan *const chan = chans[y]; + const int confmode = chan->confmode & DAHDI_CONF_MODE_MASK; + if (chan && (chan->confna == x) && + (confmode == DAHDI_CONF_CONF || + confmode == DAHDI_CONF_CONFANN || + confmode == DAHDI_CONF_CONFMON || + confmode == DAHDI_CONF_CONFANNMON || + confmode == DAHDI_CONF_REALANDPSEUDO)) { return; } } |