Skip to content

Commit

Permalink
[PATCH] 3c509: bus registration fix
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Andrew Morton authored and Jeff Garzik committed Mar 11, 2006
1 parent b2cba5b commit 0992a5d
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/net/3c509.c
Original file line number Diff line number Diff line change
Expand Up @@ -1574,6 +1574,7 @@ MODULE_LICENSE("GPL");

static int __init el3_init_module(void)
{
int ret = 0;
el3_cards = 0;

if (debug >= 0)
Expand All @@ -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)
Expand Down

0 comments on commit 0992a5d

Please sign in to comment.