提交 0992a5d0 编写于 作者: A Andrew Morton 提交者: Jeff Garzik

[PATCH] 3c509: bus registration fix

- Don't call eisa_driver_unregister() if eisa_driver_register() failed.

- Properly propagate error values.
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NJeff Garzik <jeff@garzik.org>
上级 b2cba5b5
...@@ -1574,6 +1574,7 @@ MODULE_LICENSE("GPL"); ...@@ -1574,6 +1574,7 @@ MODULE_LICENSE("GPL");
static int __init el3_init_module(void) static int __init el3_init_module(void)
{ {
int ret = 0;
el3_cards = 0; el3_cards = 0;
if (debug >= 0) if (debug >= 0)
...@@ -1589,14 +1590,16 @@ static int __init el3_init_module(void) ...@@ -1589,14 +1590,16 @@ static int __init el3_init_module(void)
} }
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
if (eisa_driver_register (&el3_eisa_driver) < 0) { ret = eisa_driver_register(&el3_eisa_driver);
eisa_driver_unregister (&el3_eisa_driver);
}
#endif #endif
#ifdef CONFIG_MCA #ifdef CONFIG_MCA
mca_register_driver(&el3_mca_driver); {
int err = mca_register_driver(&el3_mca_driver);
if (ret == 0)
ret = err;
}
#endif #endif
return 0; return ret;
} }
static void __exit el3_cleanup_module(void) static void __exit el3_cleanup_module(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册