diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-17 12:01:19 +1100 |
commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/net/3c509.c | |
parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
download | op-kernel-dev-23dd64011285010ac291f7dddf6e287bdb43a0ad.zip op-kernel-dev-23dd64011285010ac291f7dddf6e287bdb43a0ad.tar.gz |
Merge ../linux-2.6
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) |