* [patch] mv_cesa: fixup error handling in mv_probe()
@ 2010-05-25 9:49 Dan Carpenter
2010-05-26 0:45 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2010-05-25 9:49 UTC (permalink / raw)
To: Herbert Xu
Cc: David S. Miller, Uri Simchoni, Nicolas Pitre, Tejun Heo,
linux-crypto, kernel-janitors
The error handling in mv_probe() was a bit messed up. There were some
gotos to the wrong labels so it ended up releasing stuff that that hadn't
been aquired and not releasing stuff that was meant to be released. I
shuffled it around a bit to fix it and make it clearer.
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
I'm afraid that I don't have a cross compile environment set up so I
can't even compile this. I'm very sorry about that.
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index e095422..7d279e5 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -1055,20 +1055,20 @@ static int mv_probe(struct platform_device *pdev)
cp->queue_th = kthread_run(queue_manag, cp, "mv_crypto");
if (IS_ERR(cp->queue_th)) {
ret = PTR_ERR(cp->queue_th);
- goto err_thread;
+ goto err_unmap_sram;
}
ret = request_irq(irq, crypto_int, IRQF_DISABLED, dev_name(&pdev->dev),
cp);
if (ret)
- goto err_unmap_sram;
+ goto err_thread;
writel(SEC_INT_ACCEL0_DONE, cpg->reg + SEC_ACCEL_INT_MASK);
writel(SEC_CFG_STOP_DIG_ERR, cpg->reg + SEC_ACCEL_CFG);
ret = crypto_register_alg(&mv_aes_alg_ecb);
if (ret)
- goto err_reg;
+ goto err_irq;
ret = crypto_register_alg(&mv_aes_alg_cbc);
if (ret)
@@ -1091,9 +1091,9 @@ static int mv_probe(struct platform_device *pdev)
return 0;
err_unreg_ecb:
crypto_unregister_alg(&mv_aes_alg_ecb);
-err_thread:
+err_irq:
free_irq(irq, cp);
-err_reg:
+err_thread:
kthread_stop(cp->queue_th);
err_unmap_sram:
iounmap(cp->sram);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] mv_cesa: fixup error handling in mv_probe()
2010-05-25 9:49 [patch] mv_cesa: fixup error handling in mv_probe() Dan Carpenter
@ 2010-05-26 0:45 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2010-05-26 0:45 UTC (permalink / raw)
To: Dan Carpenter
Cc: David S. Miller, Uri Simchoni, Nicolas Pitre, Tejun Heo,
linux-crypto, kernel-janitors
On Tue, May 25, 2010 at 11:49:47AM +0200, Dan Carpenter wrote:
> The error handling in mv_probe() was a bit messed up. There were some
> gotos to the wrong labels so it ended up releasing stuff that that hadn't
> been aquired and not releasing stuff that was meant to be released. I
> shuffled it around a bit to fix it and make it clearer.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Patch applied. Thank you.
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-26 0:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-25 9:49 [patch] mv_cesa: fixup error handling in mv_probe() Dan Carpenter
2010-05-26 0:45 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).