From 20c1b0ef7956e823a1d4328fc6840d815aa4d003 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 25 Jun 2009 14:46:31 +0800
Subject: [PATCH] --- yaml --- r: 157938 b: refs/heads/master c:
 435578aeaad5859dda8657e3ed2c1a5bc1e524ec h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/crypto/ablkcipher.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c77a061daff2..2c736cd87c53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409a736336b560798f84d71ad6477c8fad20b523
+refs/heads/master: 435578aeaad5859dda8657e3ed2c1a5bc1e524ec
diff --git a/trunk/crypto/ablkcipher.c b/trunk/crypto/ablkcipher.c
index e11ce37c7104..43fc8fb9f978 100644
--- a/trunk/crypto/ablkcipher.c
+++ b/trunk/crypto/ablkcipher.c
@@ -201,8 +201,9 @@ static int crypto_givcipher_default(struct crypto_alg *alg, u32 type, u32 mask)
 	int err;
 
 	larval = crypto_larval_lookup(alg->cra_driver_name,
+				      (type & ~CRYPTO_ALG_TYPE_MASK) |
 				      CRYPTO_ALG_TYPE_GIVCIPHER,
-				      CRYPTO_ALG_TYPE_MASK);
+				      mask | CRYPTO_ALG_TYPE_MASK);
 	err = PTR_ERR(larval);
 	if (IS_ERR(larval))
 		goto out;