From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964863AbbDUQbT (ORCPT ); Tue, 21 Apr 2015 12:31:19 -0400 Received: from mail.csclub.uwaterloo.ca ([129.97.134.52]:34390 "EHLO mail.csclub.uwaterloo.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932541AbbDUQbP (ORCPT ); Tue, 21 Apr 2015 12:31:15 -0400 From: "Lennart Sorensen" Date: Tue, 21 Apr 2015 12:31:13 -0400 To: Len Sorensen Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Rabin Vincent , Herbert Xu , Jiri Slaby Subject: [PATCH 3.12.y stable] crypto: testmgr - fix 3.12.40 regression Message-ID: <20150421163113.GA16880@csclub.uwaterloo.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- crypto/testmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 317c31f..93e508c 100644 --- 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 */ -- 1.7.10.4