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

Merge "soc: qcom: use interruptible wait_for_completion API"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-25 18:31:04 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9f8e4e930a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/soc/qcom/wcd-dsp-glink.c
View file

@ -216,9 +216,9 @@ static bool wdsp_glink_notify_rx_intent_req(void *handle, const void *priv,
mutex_lock(&ch->mutex); mutex_lock(&ch->mutex);
rc = glink_queue_rx_intent(ch->handle, ch, req_size); rc = glink_queue_rx_intent(ch->handle, ch, req_size);
if (IS_ERR_VALUE(ret)) { if (IS_ERR_VALUE(rc)) {
dev_err(wpriv->dev, "%s: Failed to queue rx intent\n", dev_err(wpriv->dev, "%s: Failed to queue rx intent, rc = %d\n",
__func__); __func__, rc);
mutex_unlock(&ch->mutex); mutex_unlock(&ch->mutex);
goto done; goto done;
} }
@ -659,10 +659,13 @@ static ssize_t wdsp_glink_read(struct file *file, char __user *buf,
count = WDSP_MAX_READ_SIZE; count = WDSP_MAX_READ_SIZE;
} }
/* /*
* This is unblocked only from glink rx notification callback * Complete signal has given from glink rx notification callback
* or from flush API. * or from flush API. Also use interruptible wait_for_completion API
* to allow the system to go in suspend.
*/ */
wait_for_completion(&wpriv->rsp_complete); ret = wait_for_completion_interruptible(&wpriv->rsp_complete);
if (ret)
goto done;
mutex_lock(&wpriv->rsp_mutex); mutex_lock(&wpriv->rsp_mutex);
if (wpriv->rsp_cnt) { if (wpriv->rsp_cnt) {