[PATCH] NUMA topology sysfs panic fix

This (from wli & myself) was overlooked for 2.5.51.  Without this fix,
sysfs panics when registering topology for NUMA boxen.

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/base/memblk.c b/drivers/base/memblk.c
index deed83fa4070..bac6fb235086 100644
--- a/drivers/base/memblk.c
+++ b/drivers/base/memblk.c
@@ -49,7 +49,7 @@ int __init register_memblk(struct memblk *memblk, int num, struct node *root)
 
 static int __init register_memblk_type(void)
 {
-	driver_register(&memblk_driver);
-	return devclass_register(&memblk_devclass);
+	int error = devclass_register(&memblk_devclass);
+	return error ? error : driver_register(&memblk_driver);
 }
 postcore_initcall(register_memblk_type);
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 815567bd72fe..8196d30dad0d 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -93,7 +93,7 @@ int __init register_node(struct node *node, int num, struct node *parent)
 
 static int __init register_node_type(void)
 {
-	devclass_register(&node_devclass);
-	return driver_register(&node_driver);
+	int error = devclass_register(&node_devclass);
+	return error ? error : driver_register(&node_driver);
 }
 postcore_initcall(register_node_type);