diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-21 19:45:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-21 19:45:32 -0700 |
| commit | 7e2f037b9226452de60a74e94e5c42d3e54c8637 (patch) | |
| tree | 43fb239c5f63a3ae5bfea75b639aff9e8816aef5 /crypto/tcrypt.c | |
| parent | 0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (diff) | |
| parent | 7bc301e97b96597df967f11b9fa9cf391109893a (diff) | |
| download | kernel-crypto-7e2f037b9226452de60a74e94e5c42d3e54c8637.tar.gz kernel-crypto-7e2f037b9226452de60a74e94e5c42d3e54c8637.tar.xz kernel-crypto-7e2f037b9226452de60a74e94e5c42d3e54c8637.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] tcrypt: Fix error checking for comp allocation
[CRYPTO] doc: Fix typo in hash example
[CRYPTO] api: scatterwalk_copychunks() fails to advance through scatterlist
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index f5e9da319ec..8eaa5aa210b 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -768,7 +768,7 @@ static void test_deflate(void) tv = (void *)tvmem; tfm = crypto_alloc_comp("deflate", 0, CRYPTO_ALG_ASYNC); - if (tfm == NULL) { + if (IS_ERR(tfm)) { printk("failed to load transform for deflate\n"); return; } |