Skip to content

Commit

Permalink
depca: fix leaks in depca_module_init()
Browse files Browse the repository at this point in the history
Since some of xxx_register_driver() can return error we must unregister
already registered drivers.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Kulikov Vasiliy authored and David S. Miller committed Jul 13, 2010
1 parent 9e34a5b commit 84c3b97
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions drivers/net/depca.c
Original file line number Diff line number Diff line change
Expand Up @@ -2061,18 +2061,35 @@ static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

static int __init depca_module_init (void)
{
int err = 0;
int err = 0;

#ifdef CONFIG_MCA
err = mca_register_driver (&depca_mca_driver);
err = mca_register_driver(&depca_mca_driver);
if (err)
goto err;
#endif
#ifdef CONFIG_EISA
err |= eisa_driver_register (&depca_eisa_driver);
err = eisa_driver_register(&depca_eisa_driver);
if (err)
goto err_mca;
#endif
err |= platform_driver_register (&depca_isa_driver);
depca_platform_probe ();
err = platform_driver_register(&depca_isa_driver);
if (err)
goto err_eisa;

return err;
depca_platform_probe();
return 0;

err_eisa:
#ifdef CONFIG_EISA
eisa_driver_unregister(&depca_eisa_driver);
err_mca:
#endif
#ifdef CONFIG_MCA
mca_unregister_driver(&depca_mca_driver);
err:
#endif
return err;
}

static void __exit depca_module_exit (void)
Expand Down

0 comments on commit 84c3b97

Please sign in to comment.