Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

1 files changed, 6 insertions, 1 deletions

diff --git a/crypto/shash.c b/crypto/shash.c
index c9df367332ff..d5a2b619c55f 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -388,10 +388,15 @@ static int crypto_init_shash_ops_compat(struct crypto_tfm *tfm)
         struct shash_desc *desc = crypto_tfm_ctx(tfm);
         struct crypto_shash *shash;
 
+        if (!crypto_mod_get(calg))
+                return -EAGAIN;
+
         shash = __crypto_shash_cast(crypto_create_tfm(
                 calg, &crypto_shash_type));
-        if (IS_ERR(shash))
+        if (IS_ERR(shash)) {
+                crypto_mod_put(calg);
                 return PTR_ERR(shash);
+        }
 
         desc->tfm = shash;
         tfm->exit = crypto_exit_shash_ops_compat;