[PATCH] 3c509: bus registration fix

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

- Properly propagate error values.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Andrew Morton 2006-03-08 00:06:27 -08:00 committed by Jeff Garzik
parent b2cba5b577
commit 0992a5d029
1 changed files with 8 additions and 5 deletions

View File

@ -1574,6 +1574,7 @@ MODULE_LICENSE("GPL");
static int __init el3_init_module(void)
{
int ret = 0;
el3_cards = 0;
if (debug >= 0)
@ -1589,14 +1590,16 @@ static int __init el3_init_module(void)
}
#ifdef CONFIG_EISA
if (eisa_driver_register (&el3_eisa_driver) < 0) {
eisa_driver_unregister (&el3_eisa_driver);
}
ret = eisa_driver_register(&el3_eisa_driver);
#endif
#ifdef CONFIG_MCA
mca_register_driver(&el3_mca_driver);
{
int err = mca_register_driver(&el3_mca_driver);
if (ret == 0)
ret = err;
}
#endif
return 0;
return ret;
}
static void __exit el3_cleanup_module(void)