[PATCH] crypto: ansi_cprng - Fix module initialization

STALE6218d

3 messages, 3 authors, 2009-08-29 · open the first message on its own page

[PATCH] crypto: ansi_cprng - Fix module initialization

From: Steffen Klassert <steffen.klassert@secunet.com>
Date: 2009-08-25 08:11:26

Return the value we got from crypto_register_alg() instead of
returning 0 in any case.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 crypto/ansi_cprng.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
index 5357ba7..3aa6e38 100644
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c

@@ -408,17 +408,10 @@ static struct crypto_alg rng_alg = {
 /* Module initalization */
 static int __init prng_mod_init(void)
 {
-	int ret = 0;
-
 	if (fips_enabled)
 		rng_alg.cra_priority += 200;
 
-	ret = crypto_register_alg(&rng_alg);

Re: [PATCH] crypto: ansi_cprng - Fix module initialization

From: Neil Horman <nhorman@tuxdriver.com>
Date: 2009-08-25 10:59:08

On Tue, Aug 25, 2009 at 10:14:16AM +0200, Steffen Klassert wrote:

quoted hunk

Return the value we got from crypto_register_alg() instead of
returning 0 in any case.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 crypto/ansi_cprng.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
index 5357ba7..3aa6e38 100644
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c

@@ -408,17 +408,10 @@ static struct crypto_alg rng_alg = {
 /* Module initalization */
 static int __init prng_mod_init(void)
 {
-	int ret = 0;
-
 	if (fips_enabled)
 		rng_alg.cra_priority += 200;
 
-	ret = crypto_register_alg(&rng_alg);
-
-	if (ret)
-		goto out;
-out:
-	return 0;
+	return crypto_register_alg(&rng_alg);
 }
 
 static void __exit prng_mod_fini(void)

-- 
1.5.4.2

Thanks!

Acked-by: Neil Horman <nhorman@tuxdriver.com>

Re: [PATCH] crypto: ansi_cprng - Fix module initialization

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2009-08-29 07:36:53

On Tue, Aug 25, 2009 at 06:59:00AM -0400, Neil Horman wrote:

On Tue, Aug 25, 2009 at 10:14:16AM +0200, Steffen Klassert wrote:

quoted

Return the value we got from crypto_register_alg() instead of
returning 0 in any case.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

Acked-by: Neil Horman <nhorman@tuxdriver.com>

Patch applied.  Thanks a lot!
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} [off-list ref]
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help