From 677082a516b381b337ca919ef6444c822817c5aa Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 8 Mar 2006 00:06:27 -0800
Subject: [PATCH] --- yaml --- r: 20999 b: refs/heads/master c:
 0992a5d029181421877a716eaf99145828ff7eae h: refs/heads/master i:   20997:
 68495467686e9c6826aed34ed2c4df9d41a39773   20995:
 0e946be7cf6e2f549524ca0245a814b050fda0a0   20991:
 d2687a6199f374786d9e20952407885b26b64d5a v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/3c509.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 47a5b5030eae..f05ac59d38c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2cba5b5777123c53852639c6a17e87709e055be
+refs/heads/master: 0992a5d029181421877a716eaf99145828ff7eae
diff --git a/trunk/drivers/net/3c509.c b/trunk/drivers/net/3c509.c
index 824e430486c2..830528dce0ca 100644
--- a/trunk/drivers/net/3c509.c
+++ b/trunk/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)