diff options
Diffstat (limited to 'drivers/dahdi')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 48361e2..b9661aa 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3838,11 +3838,11 @@ static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int if (!res && chans[ch.chan]->span->chanconfig) res = chans[ch.chan]->span->chanconfig(chans[ch.chan], ch.sigtype); - if (chans[ch.chan]->master) { + if (chans[ch.chan]->master != chans[ch.chan]) { struct dahdi_chan *oldmaster = chans[ch.chan]->master; /* Clear the master channel */ - chans[ch.chan]->master = 0; + chans[ch.chan]->master = chans[ch.chan]; chans[ch.chan]->nextslave = 0; /* Unlink this channel from the master's channel list */ recalc_slaves(oldmaster); @@ -4878,6 +4878,7 @@ static int dahdi_chan_ioctl(struct inode *inode, struct file *file, unsigned int int oldconf; void *rxgain=NULL; + WARN_ON(!chan->master); if (!chan) return -ENOSYS; |