diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-18 03:51:42 +0100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-18 03:51:42 +0100 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /crypto/cbc.c | |
| parent | [XFS] Added quota targets and removed dmapi directory (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-c58310bf4933986513020fa90b4190c7492995ae.tar.xz linux-c58310bf4933986513020fa90b4190c7492995ae.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'crypto/cbc.c')
| -rw-r--r-- | crypto/cbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/cbc.c b/crypto/cbc.c index 6affff882cf8..61ac42e1e32b 100644 --- a/crypto/cbc.c +++ b/crypto/cbc.c @@ -224,7 +224,7 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = ERR_PTR(-EINVAL); if (!is_power_of_2(alg->cra_blocksize)) |