summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorMarkku Kylanpaa <ext-markku.kylanpaa@nokia.com>2011-04-20 13:34:55 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2011-04-26 16:45:32 +1000
commit455e33898e65108b379e74bcc3c9d6d2b50da9a6 (patch)
tree5cf1393824815da38b16c866db9abc42304fdf59 /drivers/crypto
parenta49e490c7a8a5c6c9474b1936ad8048f3e4440fc (diff)
downloadlinux-stable-455e33898e65108b379e74bcc3c9d6d2b50da9a6.tar.gz
linux-stable-455e33898e65108b379e74bcc3c9d6d2b50da9a6.tar.bz2
linux-stable-455e33898e65108b379e74bcc3c9d6d2b50da9a6.zip
crypto: omap-sham - fix concurrent sha1 calculations
SHA1 accelerator can also be busy. Add -EBUSY status return option and return busy status from omap_sham_finup(). Signed-off-by: Markku Kylanpaa <ext-markku.kylanpaa@nokia.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/omap-sham.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 465cde3e4f60..e36032bac2e5 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -835,7 +835,7 @@ static int omap_sham_finup(struct ahash_request *req)
ctx->flags |= FLAGS_FINUP;
err1 = omap_sham_update(req);
- if (err1 == -EINPROGRESS)
+ if (err1 == -EINPROGRESS || err1 == -EBUSY)
return err1;
/*
* final() has to be always called to cleanup resources