crypto: caam - fix memleak in caam_jr module

This patch fixes a memory leak that appears when caam_jr module is unloaded.

Cc: <stable@vger.kernel.org> # 3.13+
Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 1d80bd3636c5..b512a4ba7569 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -453,8 +453,8 @@ static int caam_jr_probe(struct platform_device *pdev)
         int error;
 
         jrdev = &pdev->dev;
-        jrpriv = kmalloc(sizeof(struct caam_drv_private_jr),
-                         GFP_KERNEL);
+        jrpriv = devm_kmalloc(jrdev, sizeof(struct caam_drv_private_jr),
+                              GFP_KERNEL);
         if (!jrpriv)
                 return -ENOMEM;
 
@@ -487,10 +487,8 @@ static int caam_jr_probe(struct platform_device *pdev)
 
         /* Now do the platform independent part */
         error = caam_jr_init(jrdev); /* now turn on hardware */
-        if (error) {
-                kfree(jrpriv);
+        if (error)
                 return error;
-        }
 
         jrpriv->dev = jrdev;
         spin_lock(&driver_data.jr_alloc_lock);