[svn-commits] tzafrir: linux/trunk r9925 - /linux/trunk/drivers/dahdi/xpp/xbus-core.c

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue May 31 08:11:56 2011
New Revision: 9925

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9925
Log:
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 at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/xpp/xbus-core.c

Modified: linux/trunk/drivers/dahdi/xpp/xbus-core.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-core.c?view=diff&rev=9925&r1=9924&r2=9925
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-core.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-core.c Tue May 31 08:11:56 2011
@@ -95,7 +95,7 @@
 {
 	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 @@
 			return -EBUSY;
 		}
 	} else {
-		XBUS_NOTICE(xbus, "MISSING BOARD LABEL!!!\n");
+		XBUS_NOTICE(xbus, "Missing board label (old Astribank?)\n");
 	}
 	return 0;
 }