Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] tokenring: fix module_init error handling

Browse source 
- 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 <jgarzik@pobox.com>
Cc: Mike Phillips <mikep@linuxtr.net>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>

 drivers/net/tokenring/proteon.c |    9 +++++++--
 drivers/net/tokenring/skisa.c   |    9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Akinobu Mita 2006-10-29 03:52:14 +09:00 committed by Jeff Garzik
parent 06f0015ace
commit 9d4df9e0fa
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/tokenring/proteon.c
View file

@ -370,6 +370,10 @@ static int __init proteon_init(void)
dev->dma = dma[i]; dev->dma = dma[i];
pdev = platform_device_register_simple("proteon", pdev = platform_device_register_simple("proteon",
i, NULL, 0); i, NULL, 0);
if (IS_ERR(pdev)) {
free_netdev(dev);
continue;
}
err = setup_card(dev, &pdev->dev); err = setup_card(dev, &pdev->dev);
if (!err) { if (!err) {
proteon_dev[i] = pdev; proteon_dev[i] = pdev;
@ -385,9 +389,10 @@ static int __init proteon_init(void)
/* Probe for cards. */ /* Probe for cards. */
if (num == 0) { if (num == 0) {
printk(KERN_NOTICE "proteon.c: No cards found.\n"); 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) static void __exit proteon_cleanup(void)

9
drivers/net/tokenring/skisa.c
View file

@ -380,6 +380,10 @@ static int __init sk_isa_init(void)
dev->dma = dma[i]; dev->dma = dma[i];
pdev = platform_device_register_simple("skisa", pdev = platform_device_register_simple("skisa",
i, NULL, 0); i, NULL, 0);
if (IS_ERR(pdev)) {
free_netdev(dev);
continue;
}
err = setup_card(dev, &pdev->dev); err = setup_card(dev, &pdev->dev);
if (!err) { if (!err) {
sk_isa_dev[i] = pdev; sk_isa_dev[i] = pdev;
@ -395,9 +399,10 @@ static int __init sk_isa_init(void)
/* Probe for cards. */ /* Probe for cards. */
if (num == 0) { if (num == 0) {
printk(KERN_NOTICE "skisa.c: No cards found.\n"); 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) static void __exit sk_isa_cleanup(void)