crypto: testmgr - fix 3.12.40 regression

commit ace3fc1e3f3a85ec705805146247231b11e1babe in 3.12.40 missed two
lines while pulling in commit 8a45ac12ec5b6ee67f8559c78ae11d9af8b821ee
from upstream.  This causes the tests to fail in some cases.

With the two missing lines added in, the tests pass again.

Tested with omap-aes, omap-sham and talitos.

Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 317c31f0b2623bc12cd9ea9613ddd8d01c4775ad..93e508c39e3beb826f59ccae2e68d52494e96e3f 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -334,6 +334,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
                        case -EBUSY:
                                wait_for_completion(&tresult.completion);
                                INIT_COMPLETION(tresult.completion);
+                               ret = tresult.err;
                                if (!ret)
                                        break;
                                /* fall through */
@@ -1079,6 +1080,7 @@ static int __test_skcipher(struct crypto_ablkcipher *tfm, int enc,
                        case -EBUSY:
                                wait_for_completion(&result.completion);
                                INIT_COMPLETION(result.completion);
+                               ret = result.err;
                                if (!ret)
                                        break;
                                /* fall through */