Commit 0992a5d0 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

[PATCH] 3c509: bus registration fix 



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

- Properly propagate error values.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b2cba5b5

drivers/net/3c509.c

+8 −5
Original line number Diff line number Diff line
@@ -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)