diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-12-11 21:14:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-11 21:14:54 -0800 |
| commit | c4156234868bc905c9409956e3853b2a8b417c94 (patch) | |
| tree | 9d285268c8f2aa7f16e63757891acda27ea7706c | |
| parent | b7d55bdef051295281a974f1785a0ceb69facfce (diff) | |
| parent | 2f9254f08aa312a84da17737a4cc4de54ff4f66c (diff) | |
| download | msm-extra-c4156234868bc905c9409956e3853b2a8b417c94.tar.gz | |
Merge "ASoC: fix compilation warnings after enabling LLVM"
| -rw-r--r-- | asoc/codecs/wcd_cpe_services.c | 4 | ||||
| -rw-r--r-- | dsp/q6lsm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asoc/codecs/wcd_cpe_services.c b/asoc/codecs/wcd_cpe_services.c index fc8242a9..e584cf05 100644 --- a/asoc/codecs/wcd_cpe_services.c +++ b/asoc/codecs/wcd_cpe_services.c @@ -654,7 +654,7 @@ static void cpe_notify_cmi_client(struct cpe_info *t_info, u8 *payload, hdr = CMI_GET_HEADER(payload); service = CMI_HDR_GET_SERVICE(hdr); - notif.event = CPE_SVC_CMI_MSG; + notif.event = CMI_API_MSG; notif.result = result; notif.message = payload; @@ -1170,7 +1170,7 @@ static enum cpe_process_result cpe_boot_complete( } pr_debug("%s: boot complete\n", __func__); - return CPE_SVC_SUCCESS; + return CPE_PROC_SUCCESS; } static enum cpe_process_result cpe_process_send_msg( diff --git a/dsp/q6lsm.c b/dsp/q6lsm.c index 16edacef..9d0cd160 100644 --- a/dsp/q6lsm.c +++ b/dsp/q6lsm.c @@ -267,7 +267,7 @@ static void q6lsm_session_free(struct lsm_client *client) pr_debug("%s: Freeing session ID %d\n", __func__, client->session); spin_lock_irqsave(&lsm_session_lock, flags); - lsm_session[client->session] = LSM_INVALID_SESSION_ID; + lsm_session[client->session] = NULL; spin_unlock_irqrestore(&lsm_session_lock, flags); client->session = LSM_INVALID_SESSION_ID; } |