tzcom: Rename playrdy to tzapps
Also fix a pil_put() bug while we're at it.
CRs-Fixed: 307844
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/mach-msm/peripheral-reset.c b/arch/arm/mach-msm/peripheral-reset.c
index d19f1b2..5456e14 100644
--- a/arch/arm/mach-msm/peripheral-reset.c
+++ b/arch/arm/mach-msm/peripheral-reset.c
@@ -527,7 +527,7 @@
.ops = &pil_q6_ops,
},
{
- .name = "playrdy",
+ .name = "tzapps",
.pdev = {
.name = "pil_playready",
.id = -1,
diff --git a/drivers/misc/tzcom.c b/drivers/misc/tzcom.c
index 2447a8d..ba03064 100644
--- a/drivers/misc/tzcom.c
+++ b/drivers/misc/tzcom.c
@@ -759,14 +759,14 @@
PDEBUG("In here");
if (pil == NULL) {
- pil = pil_get("playrdy");
+ pil = pil_get("tzapps");
if (IS_ERR(pil)) {
PERR("Playready PIL image load failed");
pil_error = PTR_ERR(pil);
pil = NULL;
return pil_error;
}
- PDEBUG("playrdy image loaded successfully");
+ PDEBUG("tzapps image loaded successfully");
}
sb_out_init_req.pr_cmd = TZ_SCHED_CMD_ID_INIT_SB_OUT;
@@ -1006,7 +1006,7 @@
if (sb_out_phys)
pmem_kfree(sb_out_phys);
if (pil != NULL) {
- pil_put("playrdy");
+ pil_put(pil);
pil = NULL;
}
device_destroy(driver_class, tzcom_device_no);