summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Fernandes <joelf@ti.com>2013-08-17 21:42:33 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2013-08-21 21:28:05 +1000
commit05007c10ff76a9d6d85c007fe3a7f531611fda5c (patch)
treeb112cbe59ce5afbe5eb393908546a1d553ecda51
parent6242332ff2f3431c4fb6f4b21581f38f16569c13 (diff)
downloadop-kernel-dev-05007c10ff76a9d6d85c007fe3a7f531611fda5c.zip
op-kernel-dev-05007c10ff76a9d6d85c007fe3a7f531611fda5c.tar.gz
crypto: omap-aes - Convert kzalloc to devm_kzalloc
Use devm_kzalloc instead of kzalloc. With this change, there is no need to call kfree in error/exit paths. Signed-off-by: Joel Fernandes <joelf@ti.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/omap-aes.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 2fd22ca..1f3d816 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -1158,7 +1158,7 @@ static int omap_aes_probe(struct platform_device *pdev)
int err = -ENOMEM, i, j, irq = -1;
u32 reg;
- dd = kzalloc(sizeof(struct omap_aes_dev), GFP_KERNEL);
+ dd = devm_kzalloc(dev, sizeof(struct omap_aes_dev), GFP_KERNEL);
if (dd == NULL) {
dev_err(dev, "unable to alloc data struct.\n");
goto err_data;
@@ -1251,7 +1251,6 @@ err_irq:
tasklet_kill(&dd->queue_task);
pm_runtime_disable(dev);
err_res:
- kfree(dd);
dd = NULL;
err_data:
dev_err(dev, "initialization failed.\n");
@@ -1279,7 +1278,6 @@ static int omap_aes_remove(struct platform_device *pdev)
tasklet_kill(&dd->queue_task);
omap_aes_dma_cleanup(dd);
pm_runtime_disable(dd->dev);
- kfree(dd);
dd = NULL;
return 0;
OpenPOWER on IntegriCloud