aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/cryptd.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-02-07 03:15:26 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:26 -0500
commite231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f (patch)
treed4b17ef65960594681397a3acac02c2d248200b5 /crypto/cryptd.c
parentd1bc8e95445224276d7896b8b08cbb0b28a0ca80 (diff)
Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using: perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security` Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto/cryptd.c')
-rw-r--r--crypto/cryptd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 074298f2f8e3..250425263e00 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -230,7 +230,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
230 alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER, 230 alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
231 CRYPTO_ALG_TYPE_MASK); 231 CRYPTO_ALG_TYPE_MASK);
232 if (IS_ERR(alg)) 232 if (IS_ERR(alg))
233 return ERR_PTR(PTR_ERR(alg)); 233 return ERR_CAST(alg);
234 234
235 inst = cryptd_alloc_instance(alg, state); 235 inst = cryptd_alloc_instance(alg, state);
236 if (IS_ERR(inst)) 236 if (IS_ERR(inst))
@@ -267,7 +267,7 @@ static struct crypto_instance *cryptd_alloc(struct rtattr **tb)
267 267
268 algt = crypto_get_attr_type(tb); 268 algt = crypto_get_attr_type(tb);
269 if (IS_ERR(algt)) 269 if (IS_ERR(algt))
270 return ERR_PTR(PTR_ERR(algt)); 270 return ERR_CAST(algt);
271 271
272 switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) { 272 switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
273 case CRYPTO_ALG_TYPE_BLKCIPHER: 273 case CRYPTO_ALG_TYPE_BLKCIPHER: