Merge branch 'work.minix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / crypto / seqiv.c

diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index 0899d527c2845b648bc1872daf5409ca1c4a8792..17e11d51ddc36370265f4b2a6e3bf3933895c005 100644 (file)
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -23,7 +23,7 @@ static void seqiv_aead_encrypt_complete2(struct aead_request *req, int err)
        struct aead_request *subreq = aead_request_ctx(req);
        struct crypto_aead *geniv;
 
-       if (err == -EINPROGRESS)
+       if (err == -EINPROGRESS || err == -EBUSY)
                return;
 
        if (err)
@@ -36,10 +36,9 @@ out:
        kfree_sensitive(subreq->iv);
 }
 
-static void seqiv_aead_encrypt_complete(struct crypto_async_request *base,
-                                       int err)
+static void seqiv_aead_encrypt_complete(void *data, int err)
 {
-       struct aead_request *req = base->data;
+       struct aead_request *req = data;
 
        seqiv_aead_encrypt_complete2(req, err);
        aead_request_complete(req, err);