diff -urN oldtree/drivers/base/class.c newtree/drivers/base/class.c
--- oldtree/drivers/base/class.c	2006-08-02 07:14:15.000000000 -0700
+++ newtree/drivers/base/class.c	2006-08-04 08:25:25.000000000 -0700
@@ -602,6 +602,11 @@
 	if (class_dev->dev) {
 		class_name = make_class_name(class_dev->class->name,
 					     &class_dev->kobj);
+		if (IS_ERR(class_name)) {
+			error = PTR_ERR(class_name);
+			class_name = NULL;
+			goto out6;
+		}
 		error = sysfs_create_link(&class_dev->kobj,
 					  &class_dev->dev->kobj, "device");
 		if (error)
@@ -741,7 +746,11 @@
 		class_name = make_class_name(class_dev->class->name,
 					     &class_dev->kobj);
 		sysfs_remove_link(&class_dev->kobj, "device");
-		sysfs_remove_link(&class_dev->dev->kobj, class_name);
+		if (!IS_ERR(class_name))
+			sysfs_remove_link(&class_dev->dev->kobj, class_name);
+		else
+			/* Hmm, don't know what else to do */
+			class_name = NULL;
 	}
 	sysfs_remove_link(&class_dev->kobj, "subsystem");
 	class_device_remove_file(class_dev, &class_dev->uevent_attr);
@@ -804,10 +813,15 @@
 	pr_debug("CLASS: renaming '%s' to '%s'\n", class_dev->class_id,
 		 new_name);
 
-	if (class_dev->dev)
+	if (class_dev->dev) {
 		old_class_name = make_class_name(class_dev->class->name,
 						 &class_dev->kobj);
-
+		if (IS_ERR(old_class_name)) {
+			error = PTR_ERR(old_class_name);
+			old_class_name = NULL;
+			goto out;
+		}
+	}
 	strlcpy(class_dev->class_id, new_name, KOBJ_NAME_LEN);
 
 	error = kobject_rename(&class_dev->kobj, new_name);
@@ -815,6 +829,11 @@
 	if (class_dev->dev) {
 		new_class_name = make_class_name(class_dev->class->name,
 						 &class_dev->kobj);
+		if (IS_ERR(new_class_name)) {
+			error = PTR_ERR(new_class_name);
+			new_class_name = NULL;
+			goto out;
+		}
 		error = sysfs_create_link(&class_dev->dev->kobj,
 					  &class_dev->kobj, new_class_name);
 		if (error)
diff -urN oldtree/drivers/base/core.c newtree/drivers/base/core.c
--- oldtree/drivers/base/core.c	2006-08-02 07:14:15.000000000 -0700
+++ newtree/drivers/base/core.c	2006-08-04 08:25:25.000000000 -0700
@@ -608,11 +608,14 @@
 		sysfs_remove_link(&dev->kobj, "subsystem");
 		sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);
 		class_name = make_class_name(dev->class->name, &dev->kobj);
-		if (parent) {
-			sysfs_remove_link(&dev->kobj, "device");
-			sysfs_remove_link(&dev->parent->kobj, class_name);
+		if (!IS_ERR(class_name)) {
+			if (parent) {
+				sysfs_remove_link(&dev->kobj, "device");
+				sysfs_remove_link(&dev->parent->kobj,
+						  class_name);
+			}
+			kfree(class_name);
 		}
-		kfree(class_name);
 		down(&dev->class->sem);
 		list_del_init(&dev->node);
 		up(&dev->class->sem);