From 9515ad47d58629416a53bbbc975d96543c6e482c Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Mon, 12 Dec 2011 14:59:10 -0600 Subject: [PATCH] --- yaml --- r: 283301 b: refs/heads/master c: 0b2730d8d8b38e009607d5a094d48fcce73af547 h: refs/heads/master i: 283299: dd75a5d8ad41e2736c1d8d67dec2ac0e73a735ac v: v3 --- [refs] | 2 +- trunk/drivers/crypto/talitos.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1d3de61f71c0..337d429cd469 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 741e8c2d8177eca656bc015ef83ab84d817edf8c +refs/heads/master: 0b2730d8d8b38e009607d5a094d48fcce73af547 diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c index 230509e9602b..d376cc7c5e8f 100644 --- a/trunk/drivers/crypto/talitos.c +++ b/trunk/drivers/crypto/talitos.c @@ -2626,8 +2626,10 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, alg = &t_alg->algt.alg.hash.halg.base; alg->cra_init = talitos_cra_init_ahash; if (!(priv->features & TALITOS_FTR_HMAC_OK) && - !strncmp(alg->cra_name, "hmac", 4)) + !strncmp(alg->cra_name, "hmac", 4)) { + kfree(t_alg); return ERR_PTR(-ENOTSUPP); + } if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && (!strcmp(alg->cra_name, "sha224") || !strcmp(alg->cra_name, "hmac(sha224)"))) { @@ -2835,10 +2837,8 @@ static int talitos_probe(struct platform_device *ofdev) t_alg = talitos_alg_alloc(dev, &driver_algs[i]); if (IS_ERR(t_alg)) { err = PTR_ERR(t_alg); - if (err == -ENOTSUPP) { - kfree(t_alg); + if (err == -ENOTSUPP) continue; - } goto err_out; }