Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / fs / ecryptfs / crypto.c

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index f664da5..491cf5b 100644 (file)
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -68,7 +68,6 @@ static int ecryptfs_hash_digest(struct crypto_shash *tfm,
        int err;
 
        desc->tfm = tfm;
-       desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
        err = crypto_shash_digest(desc, src, len, dst);
        shash_desc_zero(desc);
        return err;