diff --git a/[refs] b/[refs] index e2432ee62ce3..1dcc84e94639 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d788fec855e832ee3381d9d3afc91c9c0292e428 +refs/heads/master: bdd3f7fa77257a818746caf9fbe0ea0e7bb7dde4 diff --git a/trunk/drivers/crypto/amcc/crypto4xx_core.c b/trunk/drivers/crypto/amcc/crypto4xx_core.c index 13f8e1a14988..802e85102c32 100644 --- a/trunk/drivers/crypto/amcc/crypto4xx_core.c +++ b/trunk/drivers/crypto/amcc/crypto4xx_core.c @@ -1244,9 +1244,9 @@ static int __init crypto4xx_probe(struct platform_device *ofdev) iounmap(core_dev->dev->ce_base); err_iomap: free_irq(core_dev->irq, dev); +err_request_irq: irq_dispose_mapping(core_dev->irq); tasklet_kill(&core_dev->tasklet); -err_request_irq: crypto4xx_destroy_sdr(core_dev->dev); err_build_sdr: crypto4xx_destroy_gdr(core_dev->dev);