Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efcfd7d3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: qdsp6v2: check EINTR when retry for habmm_socket_recv"

parents 16527590 51139b03

drivers/soc/qcom/qdsp6v2/apr_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/soc/qcom/qdsp6v2/msm_audio_ion_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);