git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[safe/jmp/linux-2.6]
/
arch
/
s390
/
crypto
/
aes_s390.c
diff --git
a/arch/s390/crypto/aes_s390.c
b/arch/s390/crypto/aes_s390.c
index
9ed05bc
..
58f4673
100644
(file)
--- a/
arch/s390/crypto/aes_s390.c
+++ b/
arch/s390/crypto/aes_s390.c
@@
-174,7
+174,7
@@
static int fallback_init_cip(struct crypto_tfm *tfm)
if (IS_ERR(sctx->fallback.cip)) {
pr_err("Allocating AES fallback algorithm %s failed\n",
name);
- return PTR_ERR(sctx->fallback.
blk
);
+ return PTR_ERR(sctx->fallback.
cip
);
}
return 0;