tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] 3c509: bus registration fix

- 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>

authored by

Andrew Morton and committed by
Jeff Garzik 0992a5d0 b2cba5b5

+8 -5
+8 -5
drivers/net/3c509.c
··· 1574 1574 1575 1575 static int __init el3_init_module(void) 1576 1576 { 1577 + int ret = 0; 1577 1578 el3_cards = 0; 1578 1579 1579 1580 if (debug >= 0) ··· 1590 1589 } 1591 1590 1592 1591 #ifdef CONFIG_EISA 1593 - if (eisa_driver_register (&el3_eisa_driver) < 0) { 1594 - eisa_driver_unregister (&el3_eisa_driver); 1595 - } 1592 + ret = eisa_driver_register(&el3_eisa_driver); 1596 1593 #endif 1597 1594 #ifdef CONFIG_MCA 1598 - mca_register_driver(&el3_mca_driver); 1595 + { 1596 + int err = mca_register_driver(&el3_mca_driver); 1597 + if (ret == 0) 1598 + ret = err; 1599 + } 1599 1600 #endif 1600 - return 0; 1601 + return ret; 1601 1602 } 1602 1603 1603 1604 static void __exit el3_cleanup_module(void)