summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-15 19:26:04 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-15 19:26:04 +0300
commitdefc7d752265c2d8d212aee9fb499243260883e9 (patch)
tree8a6f1bfd8dc5c38ab350f96e08abe5a34e8d73ec /arch
parentae50dfd61665086e617cc9e554a1285d52765670 (diff)
parent28b62b1458685d8f68f67d9b2d511bf8fa32b746 (diff)
downloadlinux-defc7d752265c2d8d212aee9fb499243260883e9.tar.xz
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: - self-test failure of crc32c on powerpc - regressions of ecb(aes) when used with xts/lrw in s5p-sss - a number of bugs in the omap RNG driver * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: s5p-sss - Fix spinlock recursion on LRW(AES) hwrng: omap - Do not access INTMASK_REG on EIP76 hwrng: omap - use devm_clk_get() instead of of_clk_get() hwrng: omap - write registers after enabling the clock crypto: s5p-sss - Fix completing crypto request in IRQ handler crypto: powerpc - Fix initialisation of crc32c context
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/crypto/crc32c-vpmsum_glue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/crypto/crc32c-vpmsum_glue.c b/arch/powerpc/crypto/crc32c-vpmsum_glue.c
index 9fa046d56eba..411994551afc 100644
--- a/arch/powerpc/crypto/crc32c-vpmsum_glue.c
+++ b/arch/powerpc/crypto/crc32c-vpmsum_glue.c
@@ -52,7 +52,7 @@ static int crc32c_vpmsum_cra_init(struct crypto_tfm *tfm)
{
u32 *key = crypto_tfm_ctx(tfm);
- *key = 0;
+ *key = ~0;
return 0;
}