Fix the driverfs oops again; only half of the fix went in and that "half" didn't check devclass_register() errors. memblk.c | 4 ++-- node.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -urpN linux-2.5.50-bk6/drivers/base/memblk.c wli-2.5.50-bk6-1/drivers/base/memblk.c --- linux-2.5.50-bk6/drivers/base/memblk.c 2002-11-27 14:36:23.000000000 -0800 +++ wli-2.5.50-bk6-1/drivers/base/memblk.c 2002-12-06 13:52:40.000000000 -0800 @@ -49,7 +49,7 @@ int __init register_memblk(struct memblk 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 -urpN linux-2.5.50-bk6/drivers/base/node.c wli-2.5.50-bk6-1/drivers/base/node.c --- linux-2.5.50-bk6/drivers/base/node.c 2002-12-06 13:44:46.000000000 -0800 +++ wli-2.5.50-bk6-1/drivers/base/node.c 2002-12-06 13:52:13.000000000 -0800 @@ -93,7 +93,7 @@ int __init register_node(struct node *no 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);