diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-06 07:25:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-06 07:25:57 -0700 |
| commit | efcfd7d353d3d42f70a35f3adb6a9d663d52c808 (patch) | |
| tree | 8454a5ce0e5a5bb4067f98bdb3e0be2881c53cc1 | |
| parent | 16527590d2b02fc56e7a4aedb5b343d9a52bce35 (diff) | |
| parent | 51139b0339c6a50cf06e6e32d154ebc56ee64e5d (diff) | |
Merge "audio: qdsp6v2: check EINTR when retry for habmm_socket_recv"
| -rw-r--r-- | drivers/soc/qcom/qdsp6v2/apr_vm.c | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/soc/qcom/qdsp6v2/apr_vm.c b/drivers/soc/qcom/qdsp6v2/apr_vm.c index bd555b6e6f3b..bb5ba663c6a8 100644 --- a/drivers/soc/qcom/qdsp6v2/apr_vm.c +++ b/drivers/soc/qcom/qdsp6v2/apr_vm.c @@ -541,7 +541,7 @@ static int apr_vm_cb_thread(void *data) &apr_rx_buf_len, 0xFFFFFFFF, 0); - } while (time_before(jiffies, delay) && (ret == -EAGAIN) && + } while (time_before(jiffies, delay) && (ret == -EINTR) && (apr_rx_buf_len == 0)); if (ret) { pr_err("%s: habmm_socket_recv failed %d\n", diff --git a/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c b/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c index 15c3e7e42c6d..aa19d571552e 100644 --- a/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c +++ b/drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c @@ -130,7 +130,7 @@ static int msm_audio_ion_smmu_map(struct ion_client *client, &cmd_rsp_size, 0xFFFFFFFF, 0); - } while (time_before(jiffies, delay) && (rc == -EAGAIN) && + } while (time_before(jiffies, delay) && (rc == -EINTR) && (cmd_rsp_size == 0)); if (rc) { pr_err("%s: habmm_socket_recv failed %d\n", @@ -218,7 +218,7 @@ static int msm_audio_ion_smmu_unmap(struct ion_client *client, 0xFFFFFFFF, 0); } while (time_before(jiffies, delay) && - (rc == -EAGAIN) && (cmd_rsp_size == 0)); + (rc == -EINTR) && (cmd_rsp_size == 0)); if (rc) { pr_err("%s: habmm_socket_recv failed %d\n", __func__, rc); |