Commit 543f5492 authored by Matthew Dobson's avatar Matthew Dobson Committed by Linus Torvalds

[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.
parent d1e652c7
...@@ -49,7 +49,7 @@ int __init register_memblk(struct memblk *memblk, int num, struct node *root) ...@@ -49,7 +49,7 @@ int __init register_memblk(struct memblk *memblk, int num, struct node *root)
static int __init register_memblk_type(void) static int __init register_memblk_type(void)
{ {
driver_register(&memblk_driver); int error = devclass_register(&memblk_devclass);
return devclass_register(&memblk_devclass); return error ? error : driver_register(&memblk_driver);
} }
postcore_initcall(register_memblk_type); postcore_initcall(register_memblk_type);
...@@ -93,7 +93,7 @@ int __init register_node(struct node *node, int num, struct node *parent) ...@@ -93,7 +93,7 @@ int __init register_node(struct node *node, int num, struct node *parent)
static int __init register_node_type(void) static int __init register_node_type(void)
{ {
devclass_register(&node_devclass); int error = devclass_register(&node_devclass);
return driver_register(&node_driver); return error ? error : driver_register(&node_driver);
} }
postcore_initcall(register_node_type); postcore_initcall(register_node_type);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment