From 885518784a8ded7ae61367398fef5b5430bc6d04 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 26 May 2010 10:36:51 +1000 Subject: [PATCH] --- yaml --- r: 204329 b: refs/heads/master c: 8db050786aaf7a43f4c7a900a103f99ea0fb493f h: refs/heads/master i: 204327: 3f6270e1d17cc8fae696bce716e3e76664f64e33 v: v3 --- [refs] | 2 +- trunk/crypto/authenc.c | 2 +- trunk/crypto/ctr.c | 2 +- trunk/crypto/xts.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 60fbe61795d1..0e1936d8dde8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1efbd15c3bc2b79d33e033e898211109c32159fa +refs/heads/master: 8db050786aaf7a43f4c7a900a103f99ea0fb493f diff --git a/trunk/crypto/authenc.c b/trunk/crypto/authenc.c index b9884ee0adb6..a5a22cfcd07b 100644 --- a/trunk/crypto/authenc.c +++ b/trunk/crypto/authenc.c @@ -616,7 +616,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb) auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH, CRYPTO_ALG_TYPE_AHASH_MASK); if (IS_ERR(auth)) - return ERR_PTR(PTR_ERR(auth)); + return ERR_CAST(auth); auth_base = &auth->base; diff --git a/trunk/crypto/ctr.c b/trunk/crypto/ctr.c index 6c3bfabb9d1d..4ca7222cfeb6 100644 --- a/trunk/crypto/ctr.c +++ b/trunk/crypto/ctr.c @@ -185,7 +185,7 @@ static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb) alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); /* Block size must be >= 4 bytes. */ err = -EINVAL; diff --git a/trunk/crypto/xts.c b/trunk/crypto/xts.c index d87b0f3102c3..555ecaab1e54 100644 --- a/trunk/crypto/xts.c +++ b/trunk/crypto/xts.c @@ -224,7 +224,7 @@ static struct crypto_instance *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 = crypto_alloc_instance("xts", alg); if (IS_ERR(inst))