Merge tag 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[uclinux-h8/linux.git] / crypto / ahash.c

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 5e8666e..3a35d67 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -334,9 +334,7 @@ static int ahash_op_unaligned(struct ahash_request *req,
                return err;
 
        err = op(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && (ahash_request_flags(req) &
-                              CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return err;
 
        ahash_restore_req(req, err);
@@ -394,9 +392,7 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err)
        req->base.complete = ahash_def_finup_done2;
 
        err = crypto_ahash_reqtfm(req)->final(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && (ahash_request_flags(req) &
-                              CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return err;
 
 out:
@@ -432,9 +428,7 @@ static int ahash_def_finup(struct ahash_request *req)
                return err;
 
        err = tfm->update(req);
-       if (err == -EINPROGRESS ||
-           (err == -EBUSY && (ahash_request_flags(req) &
-                              CRYPTO_TFM_REQ_MAY_BACKLOG)))
+       if (err == -EINPROGRESS || err == -EBUSY)
                return err;
 
        return ahash_def_finup_finish1(req, err);