projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto: caam - fix memleak in caam_jr module
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
crypto
/
caam
/
jr.c
diff --git
a/drivers/crypto/caam/jr.c
b/drivers/crypto/caam/jr.c
index 1d80bd3636c5b1f2cf4dc078d4934e64befc7f68..b512a4ba7569695a4e19ca4e88b9b4de4cc5f826 100644
(file)
--- 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;
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;
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 */
/* Now do the platform independent part */
error = caam_jr_init(jrdev); /* now turn on hardware */
- if (error) {
- kfree(jrpriv);
+ if (error)
return error;
return error;
- }
jrpriv->dev = jrdev;
spin_lock(&driver_data.jr_alloc_lock);
jrpriv->dev = jrdev;
spin_lock(&driver_data.jr_alloc_lock);