Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / security / keys / trusted.c

diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index efdbf17f3915259ea34ed76f5d452a4763236043..a75b2f0f123086a1c6fa1b397276ccbca1899a46 100644 (file)
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -55,7 +55,6 @@ static struct sdesc *init_sdesc(struct crypto_shash *alg)
        if (!sdesc)
                return ERR_PTR(-ENOMEM);
        sdesc->shash.tfm = alg;
-       sdesc->shash.flags = 0x0;
        return sdesc;
 }