Merge "ASoC: fix compilation warnings after enabling LLVM"

This commit is contained in:
Linux Build Service Account 2018-04-03 01:01:10 -07:00 • committed by Gerrit - the friendly Code Review server
commit d100585a8a
2 changed files with 3 additions and 3 deletions

View file

@ -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(

View file

@ -225,7 +225,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;
}