diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-09-22 13:42:27 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-23 16:02:25 -0400 |
commit | 48e6dc1b2a1ad8186d48968d5018912bdacac744 (patch) | |
tree | 952bc225ac6f5fa526a37dac87a3792ce041d2a4 /drivers/crypto | |
parent | 0ff647551b4282eee90a6d944c9fccde07845db4 (diff) |
crypto: dcp - Fix the path for releasing the resources
tasklet_kill() is not being called in probe and the remove function releases
the resources in the wrong order.
Fix these issues.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r-- | drivers/crypto/dcp.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c index 93ab753d610d..7b77c8457854 100644 --- a/drivers/crypto/dcp.c +++ b/drivers/crypto/dcp.c | |||
@@ -842,6 +842,8 @@ err_unregister: | |||
842 | for (j = 0; j < i; j++) | 842 | for (j = 0; j < i; j++) |
843 | crypto_unregister_alg(&algs[j]); | 843 | crypto_unregister_alg(&algs[j]); |
844 | err_free_key_iv: | 844 | err_free_key_iv: |
845 | tasklet_kill(&dev->done_task); | ||
846 | tasklet_kill(&dev->queue_task); | ||
845 | dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base, | 847 | dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base, |
846 | dev->payload_base_dma); | 848 | dev->payload_base_dma); |
847 | err_free_hw_packet: | 849 | err_free_hw_packet: |
@@ -858,20 +860,20 @@ static int dcp_remove(struct platform_device *pdev) | |||
858 | int j; | 860 | int j; |
859 | dev = platform_get_drvdata(pdev); | 861 | dev = platform_get_drvdata(pdev); |
860 | 862 | ||
861 | dma_free_coherent(&pdev->dev, | 863 | misc_deregister(&dev->dcp_bootstream_misc); |
862 | DCP_MAX_PKG * sizeof(struct dcp_hw_packet), | ||
863 | dev->hw_pkg[0], dev->hw_phys_pkg); | ||
864 | 864 | ||
865 | dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base, | 865 | for (j = 0; j < ARRAY_SIZE(algs); j++) |
866 | dev->payload_base_dma); | 866 | crypto_unregister_alg(&algs[j]); |
867 | 867 | ||
868 | tasklet_kill(&dev->done_task); | 868 | tasklet_kill(&dev->done_task); |
869 | tasklet_kill(&dev->queue_task); | 869 | tasklet_kill(&dev->queue_task); |
870 | 870 | ||
871 | for (j = 0; j < ARRAY_SIZE(algs); j++) | 871 | dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base, |
872 | crypto_unregister_alg(&algs[j]); | 872 | dev->payload_base_dma); |
873 | 873 | ||
874 | misc_deregister(&dev->dcp_bootstream_misc); | 874 | dma_free_coherent(&pdev->dev, |
875 | DCP_MAX_PKG * sizeof(struct dcp_hw_packet), | ||
876 | dev->hw_pkg[0], dev->hw_phys_pkg); | ||
875 | 877 | ||
876 | return 0; | 878 | return 0; |
877 | } | 879 | } |