diff options
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 5 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi-sysfs.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 3886e69..eb19188 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -6882,9 +6882,8 @@ static int _dahdi_assign_span(struct dahdi_span *span, unsigned int spanno, if (test_bit(DAHDI_FLAGBIT_REGISTERED, &span->flags)) { dev_notice(span_device(span), - "local span %d is already assigned span %d " - "with base channel %d\n", local_spanno(span), span->spanno, - span->chans[0]->channo); + "local span %d is already assigned span %d\n", + local_spanno(span), span->spanno); return -EINVAL; } diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index c638104..3b9784d 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -250,6 +250,8 @@ static BUS_ATTR_READER(basechan_show, dev, buf) struct dahdi_span *span; span = dev_to_span(dev); + if (!span->channels) + return -ENODEV; return sprintf(buf, "%d\n", span->chans[0]->channo); } |