From 9f761bc4d515dccd523aa8dc376d0e73cee12dfb Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 2 Jul 2009 23:27:22 +0200
Subject: [PATCH] --- yaml --- r: 155409 b: refs/heads/master c:
 08f42877aff6b966a386c47e0aeb98e7645db2a9 h: refs/heads/master i:   155407:
 f2dc9f5e93124069cd7f5a3fd91a73fb372b9081 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/sparc/kernel/vio.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8737bcc8ded0..03ae8cabc2c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8c73c790c588fd70fda1632c8927a87b3d31dcd
+refs/heads/master: 08f42877aff6b966a386c47e0aeb98e7645db2a9
diff --git a/trunk/arch/sparc/kernel/vio.c b/trunk/arch/sparc/kernel/vio.c
index 753d128ed158..c28c71449a6c 100644
--- a/trunk/arch/sparc/kernel/vio.c
+++ b/trunk/arch/sparc/kernel/vio.c
@@ -224,7 +224,12 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
 	if (!strcmp(type, "domain-services-port"))
 		bus_id_name = "ds";
 
-	if (strlen(bus_id_name) >= BUS_ID_SIZE - 4) {
+	/*
+	 * 20 char is the old driver-core name size limit, which is no more.
+	 * This check can probably be removed after review and possible
+	 * adaption of the vio users name length handling.
+	 */
+	if (strlen(bus_id_name) >= 20 - 4) {
 		printk(KERN_ERR "VIO: bus_id_name [%s] is too long.\n",
 		       bus_id_name);
 		return NULL;