projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'clk-imx', 'clk-samsung', 'clk-ti', 'clk-uniphier-gear' and 'clk-mmp2...
[linux-2.6-microblaze.git]
/
drivers
/
crypto
/
ccree
/
cc_driver.c
diff --git
a/drivers/crypto/ccree/cc_driver.c
b/drivers/crypto/ccree/cc_driver.c
index
8ada308
..
b0125ad
100644
(file)
--- a/
drivers/crypto/ccree/cc_driver.c
+++ b/
drivers/crypto/ccree/cc_driver.c
@@
-380,7
+380,7
@@
static int init_cc_resources(struct platform_device *plat_dev)
rc = cc_ivgen_init(new_drvdata);
if (rc) {
dev_err(dev, "cc_ivgen_init failed\n");
rc = cc_ivgen_init(new_drvdata);
if (rc) {
dev_err(dev, "cc_ivgen_init failed\n");
- goto post_
power
_mgr_err;
+ goto post_
buf
_mgr_err;
}
/* Allocate crypto algs */
}
/* Allocate crypto algs */
@@
-403,6
+403,9
@@
static int init_cc_resources(struct platform_device *plat_dev)
goto post_hash_err;
}
goto post_hash_err;
}
+ /* All set, we can allow autosuspend */
+ cc_pm_go(new_drvdata);
+
/* If we got here and FIPS mode is enabled
* it means all FIPS test passed, so let TEE
* know we're good.
/* If we got here and FIPS mode is enabled
* it means all FIPS test passed, so let TEE
* know we're good.
@@
-417,8
+420,6
@@
post_cipher_err:
cc_cipher_free(new_drvdata);
post_ivgen_err:
cc_ivgen_fini(new_drvdata);
cc_cipher_free(new_drvdata);
post_ivgen_err:
cc_ivgen_fini(new_drvdata);
-post_power_mgr_err:
- cc_pm_fini(new_drvdata);
post_buf_mgr_err:
cc_buffer_mgr_fini(new_drvdata);
post_req_mgr_err:
post_buf_mgr_err:
cc_buffer_mgr_fini(new_drvdata);
post_req_mgr_err: