diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-03-11 12:54:48 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-03-11 12:54:48 +1100 |
| commit | ae3fa576302633290c8d7c394c4098ec027bd8a1 (patch) | |
| tree | 51a6d97b1ef57be7cb16c797497a610b9e1e1a5d /crypto/cts.c | |
| parent | ca10c662b0ec80db86864277a94889cc63bae958 (diff) | |
| parent | a390f39a9ef577563398884870a50eba558dfe49 (diff) | |
| download | linux-crypto-ae3fa576302633290c8d7c394c4098ec027bd8a1.tar.gz linux-crypto-ae3fa576302633290c8d7c394c4098ec027bd8a1.zip | |
Merge tag 'v3.9-rc2' into next
Sync with Linus.
Linux 3.9-rc2
Diffstat (limited to 'crypto/cts.c')
| -rw-r--r-- | crypto/cts.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/cts.c b/crypto/cts.c index ccf9c5de..042223f8 100644 --- a/crypto/cts.c +++ b/crypto/cts.c @@ -282,9 +282,8 @@ static struct crypto_instance *crypto_cts_alloc(struct rtattr **tb) alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_BLKCIPHER, CRYPTO_ALG_TYPE_MASK); - err = PTR_ERR(alg); if (IS_ERR(alg)) - return ERR_PTR(err); + return ERR_CAST(alg); inst = ERR_PTR(-EINVAL); if (!is_power_of_2(alg->cra_blocksize)) |