diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.59-vanilla/drivers/base/cpu.c linux-2.5.59-driver_base_cleanup/drivers/base/cpu.c
--- linux-2.5.59-vanilla/drivers/base/cpu.c	Thu Jan 16 18:21:51 2003
+++ linux-2.5.59-driver_base_cleanup/drivers/base/cpu.c	Wed Jan 29 10:16:26 2003
@@ -48,7 +48,10 @@
 
 static int __init register_cpu_type(void)
 {
-	devclass_register(&cpu_devclass);
-	return driver_register(&cpu_driver);
+	int error;
+	if (!(error = devclass_register(&cpu_devclass)))
+		if (error = driver_register(&cpu_driver))
+			devclass_unregister(&cpu_devclass);
+	return error;
 }
 postcore_initcall(register_cpu_type);
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.59-vanilla/drivers/base/memblk.c linux-2.5.59-driver_base_cleanup/drivers/base/memblk.c
--- linux-2.5.59-vanilla/drivers/base/memblk.c	Thu Jan 16 18:22:57 2003
+++ linux-2.5.59-driver_base_cleanup/drivers/base/memblk.c	Wed Jan 29 10:16:08 2003
@@ -49,7 +49,10 @@
 
 static int __init register_memblk_type(void)
 {
-	int error = devclass_register(&memblk_devclass);
-	return error ? error : driver_register(&memblk_driver);
+	int error;
+	if (!(error = devclass_register(&memblk_devclass)))
+		if (error = driver_register(&memblk_driver))
+			devclass_unregister(&memblk_devclass);
+	return error;
 }
 postcore_initcall(register_memblk_type);
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.59-vanilla/drivers/base/node.c linux-2.5.59-driver_base_cleanup/drivers/base/node.c
--- linux-2.5.59-vanilla/drivers/base/node.c	Thu Jan 16 18:21:40 2003
+++ linux-2.5.59-driver_base_cleanup/drivers/base/node.c	Wed Jan 29 10:15:12 2003
@@ -91,7 +91,10 @@
 
 static int __init register_node_type(void)
 {
-	int error = devclass_register(&node_devclass);
-	return error ? error : driver_register(&node_driver);
+	int error;
+	if (!(error = devclass_register(&node_devclass)))
+		if (error = driver_register(&node_driver))
+			devclass_unregister(&node_devclass);
+	return error;
 }
 postcore_initcall(register_node_type);