summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-09 01:32:18 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-09 01:32:17 -0800
commitead7701ae500ce90f5cbf7ffdb599d10deabc53d (patch)
treed57a8c7c282df9592eace77b9301cf1ce4589993
parent3fd4881140f19e97253025f977231ba32dbde5b9 (diff)
parentf8cfc2b728a7f7ec4b841363cd7a486d7d36240c (diff)
Merge "ASoC: msm: Fix kernel crash in core_set_license"
-rw-r--r--sound/soc/msm/qdsp6v2/q6core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/msm/qdsp6v2/q6core.c b/sound/soc/msm/qdsp6v2/q6core.c
index 9782fa26a2e9..5399a101ba62 100644
--- a/sound/soc/msm/qdsp6v2/q6core.c
+++ b/sound/soc/msm/qdsp6v2/q6core.c
@@ -221,7 +221,6 @@ struct cal_block_data *cal_utils_get_cal_block_by_key(
int32_t core_set_license(uint32_t key, uint32_t module_id)
{
struct avcs_cmd_set_license *cmd_setl = NULL;
- struct audio_cal_info_metainfo *metainfo = NULL;
struct cal_block_data *cal_block = NULL;
int rc = 0, packet_size = 0;
@@ -278,9 +277,9 @@ int32_t core_set_license(uint32_t key, uint32_t module_id)
memcpy((uint8_t *)cmd_setl + sizeof(struct avcs_cmd_set_license),
cal_block->cal_data.kvaddr,
cal_block->cal_data.size);
- pr_info("%s: Set license opcode=0x%x ,key=0x%x, id =0x%x, size = %d\n",
+ pr_info("%s: Set license opcode=0x%x, id =0x%x, size = %d\n",
__func__, cmd_setl->hdr.opcode,
- metainfo->nKey, cmd_setl->id, cmd_setl->size);
+ cmd_setl->id, cmd_setl->size);
rc = apr_send_pkt(q6core_lcl.core_handle_q, (uint32_t *)cmd_setl);
if (rc < 0)
pr_err("%s: SET_LICENSE failed op[0x%x]rc[%d]\n",