diff options
author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 15:50:49 +0200 |
---|---|---|
committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 15:50:49 +0200 |
commit | e286091b2b21d1ff9166609cd19e0df62b56f4bc (patch) | |
tree | ba7bda5449376d04f32a3414dabc732f7375804d /crypto/algboss.c | |
parent | a5dc0ad5e24d2cdb1a46cc19761605e5902f83eb (diff) | |
parent | 0b4d1afc94f1724db95c365d3e36f1578ac96dbc (diff) | |
download | linux-crypto-e286091b2b21d1ff9166609cd19e0df62b56f4bc.tar.gz linux-crypto-e286091b2b21d1ff9166609cd19e0df62b56f4bc.zip |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'crypto/algboss.c')
-rw-r--r-- | crypto/algboss.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/crypto/algboss.c b/crypto/algboss.c index 6906f92a..9908dd83 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -280,29 +280,13 @@ static struct notifier_block cryptomgr_notifier = { static int __init cryptomgr_init(void) { - int err; - - err = testmgr_init(); - if (err) - return err; - - err = crypto_register_notifier(&cryptomgr_notifier); - if (err) - goto free_testmgr; - - return 0; - -free_testmgr: - testmgr_exit(); - return err; + return crypto_register_notifier(&cryptomgr_notifier); } static void __exit cryptomgr_exit(void) { int err = crypto_unregister_notifier(&cryptomgr_notifier); BUG_ON(err); - - testmgr_exit(); } subsys_initcall(cryptomgr_init); |