diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-05-31 13:16:54 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-05-31 13:16:54 +0000 |
| commit | 1e94375fb8fefeb0cc95d8d8fe3834ab667ff51a (patch) | |
| tree | 8b8dbfe32a935f0a6c118fa5bf673fcdaafd0d4a | |
| parent | 77044a1c6aab6f7466a41d3c7d6e9e4ad74aeda0 (diff) | |
xpp: empty labels are not duplicate
Some older Asttribanks had an empty label string. They should be ignored
when testing for a duplicate label at device probe time.
While we're at it, reduce panic level in the notice.
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9926 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/xpp/xbus-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index ebc7cba..dce4c1f 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -104,7 +104,7 @@ int xbus_check_unique(xbus_t *xbus) { if (!xbus) return -ENOENT; - if (xbus->label) { + if (xbus->label && *(xbus->label)) { xbus_t *xbus_old; XBUS_DBG(DEVICES, xbus, "Checking LABEL='%s'\n", xbus->label); @@ -118,7 +118,7 @@ int xbus_check_unique(xbus_t *xbus) return -EBUSY; } } else { - XBUS_NOTICE(xbus, "MISSING BOARD LABEL!!!\n"); + XBUS_NOTICE(xbus, "Missing board label (old Astribank?)\n"); } return 0; } |