From 6d9baa3f9929a851e2dde6c4cfa56461eacacf02 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 31 May 2011 13:11:56 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9925 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/xpp/xbus-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index 331ffee..bd4a003 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -95,7 +95,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); @@ -109,7 +109,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; }