evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "spcom: avoid using stale glink handle"

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-05 16:09:52 -07:00 • committed by Gerrit - the friendly Code Review server
commit f8bec54357
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/soc/qcom/spcom.c
View file

@ -493,13 +493,10 @@ static void spcom_notify_state(void *handle, const void *priv, unsigned event)
ch->glink_state = event; ch->glink_state = event;
/* if (!handle) {
* if spcom_notify_state() is called within glink_open() pr_err("inavlid glink_handle, ch [%s].\n", ch->name);
* then ch->glink_handle is not updated yet. mutex_unlock(&ch->lock);
*/ return;
if (!ch->glink_handle) {
pr_debug("update glink_handle, ch [%s].\n", ch->name);
ch->glink_handle = handle;
} }
/* signal before unlock mutex & before calling glink */ /* signal before unlock mutex & before calling glink */
@ -512,8 +509,7 @@ static void spcom_notify_state(void *handle, const void *priv, unsigned event)
*/ */
pr_debug("call glink_queue_rx_intent() ch [%s].\n", ch->name); pr_debug("call glink_queue_rx_intent() ch [%s].\n", ch->name);
ret = glink_queue_rx_intent(ch->glink_handle, ret = glink_queue_rx_intent(handle, ch, ch->rx_buf_size);
ch, ch->rx_buf_size);
if (ret) { if (ret) {
pr_err("glink_queue_rx_intent() err [%d]\n", ret); pr_err("glink_queue_rx_intent() err [%d]\n", ret);
} else { } else {