tokenring: fix module_init error handling
PATCH 1/1 tokenring: fix module_init error handling
- Call platform_driver_unregister() before return when no cards found. (fixes data corruption when no cards found)
- Check platform_device_register_simple() return value
Cc Jeff Garzik <[email protected]>
Cc Mike Phillips <[email protected]>
Signed-off-by Akinobu Mita <[email protected]>
drivers/net/tokenring/proteon.c | 9 +++++++-- drivers/net/tokenring/skisa.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/net/tokenring/proteon.c +7 -2
@@ -370,6 +370,10 @@ static int __init proteon_init(void) dev->dma = dma[i]; pdev =platform_device_register_simple ("proteon" , i,NULL ,0 ); +if (IS_ERR (pdev)) { +free_netdev (dev); +continue ; + } err =setup_card (dev, &pdev->dev);if (!err) { proteon_dev[i] = pdev;
@@ -385,9 +389,10 @@ static int __init proteon_init(void)/* Probe for cards. */ if (num ==0 ) {printk (KERN_NOTICE "proteon.c: No cards found.\n" ); -return (-ENODEV ); +platform_driver_unregister (&proteon_driver); +return -ENODEV ; } -return (0 ); +return 0 ; } static void __exit proteon_cleanup(void)
drivers/net/tokenring/skisa.c +7 -2
@@ -380,6 +380,10 @@ static int __init sk_isa_init(void) dev->dma = dma[i]; pdev =platform_device_register_simple ("skisa" , i,NULL ,0 ); +if (IS_ERR (pdev)) { +free_netdev (dev); +continue ; + } err =setup_card (dev, &pdev->dev);if (!err) { sk_isa_dev[i] = pdev;
@@ -395,9 +399,10 @@ static int __init sk_isa_init(void)/* Probe for cards. */ if (num ==0 ) {printk (KERN_NOTICE "skisa.c: No cards found.\n" ); -return (-ENODEV ); +platform_driver_unregister (&sk_isa_driver); +return -ENODEV ; } -return (0 ); +return 0 ; } static void __exit sk_isa_cleanup(void)
Jeff Garzik
AppliedQuoted 8 lines · Akinobu Mita
- Call
platform_driver_unregister()before return when no cards found. (fixes data corruption when no cards found)- Check
platform_device_register_simple()return valueCc Jeff Garzik <[email protected]>Cc Mike Phillips <[email protected]>Signed-off-by Akinobu Mita <[email protected]>
applied