2014-12-05 05:24:52

by Joshua I. James

Subject: [PATCH] staging: crypto: fixed style error in aead.c

From: "Joshua I. James" <[email protected]>

Fixed style error identified by checkpatch.

ERROR: do not use assignment in if condition
+ if ((err = crypto_register_instance(tmpl, inst))) {

Signed-off-by: Joshua I. James <[email protected]>
---
crypto/aead.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/aead.c b/crypto/aead.c
index 547491e..2222710 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -448,7 +448,8 @@ static int crypto_nivaead_default(struct crypto_alg *alg, u32 type, u32 mask)
if (IS_ERR(inst))
goto put_tmpl;

- if ((err = crypto_register_instance(tmpl, inst))) {
+ err = crypto_register_instance(tmpl, inst);
+ if (err) {
tmpl->free(inst);
goto put_tmpl;
}
--
1.9.1

2014-12-05 13:47:57

by Jason Cooper

Subject: Re: [PATCH] staging: crypto: fixed style error in aead.c

Joshua,

On Fri, Dec 05, 2014 at 02:24:44PM +0900, Joshua I. James wrote:
> From: "Joshua I. James" <[email protected]>
>
> Fixed style error identified by checkpatch.
>
> ERROR: do not use assignment in if condition
> + if ((err = crypto_register_instance(tmpl, inst))) {

Short comment needed here like I mentioned with the first patch. Also,
subject line needs corrected as with the first.

>
> Signed-off-by: Joshua I. James <[email protected]>
> ---
> crypto/aead.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/crypto/aead.c b/crypto/aead.c
> index 547491e..2222710 100644
> --- a/crypto/aead.c
> +++ b/crypto/aead.c
> @@ -448,7 +448,8 @@ static int crypto_nivaead_default(struct crypto_alg *alg, u32 type, u32 mask)
> if (IS_ERR(inst))
> goto put_tmpl;
>
> - if ((err = crypto_register_instance(tmpl, inst))) {
> + err = crypto_register_instance(tmpl, inst);
> + if (err) {
> tmpl->free(inst);
> goto put_tmpl;
> }

I haven't looked at the rest of the series yet, but if they are just
like this one, Herbert may prefer just to put these all in one patch.
I'll add him to the To: and you should wait for his response.

thx,

Jason.