diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 14:32:24 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 14:32:24 -0700 |
commit | 88fd32554ae2782729bd3031d978bfbba0669459 (patch) | |
tree | 917cbc551b971cd0637650b95882d97fac9a4b89 /crypto/algboss.c | |
parent | c0a16d573d49785fedcacf87328ac5257bcb70c0 (diff) | |
parent | e286091b2b21d1ff9166609cd19e0df62b56f4bc (diff) | |
download | linux-crypto-88fd32554ae2782729bd3031d978bfbba0669459.tar.gz linux-crypto-88fd32554ae2782729bd3031d978bfbba0669459.zip |
Merge commit 'v2.6.31-rc1' into dmaengine
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); |