diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:55:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:55:26 -0500 |
| commit | ed071adc97a69785686a37fb88e100f41b482b94 (patch) | |
| tree | 75be27a48365aab9cfe6531f7d1f5516e6602307 /drivers/net/3c509.c | |
| parent | 6971ed1fbbc80cae54e082aae153d5b063885d0a (diff) | |
| parent | 535744878e34d01a53f946f26dfbca37186f2cf8 (diff) | |
| download | op-kernel-dev-ed071adc97a69785686a37fb88e100f41b482b94.zip op-kernel-dev-ed071adc97a69785686a37fb88e100f41b482b94.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/3c509.c')
| -rw-r--r-- | drivers/net/3c509.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 824e430..830528d 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c @@ -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) |
