Merge "ASoC: msm: qdsp6v2: Fix timeout error in ADM_CMD_SET_PP_PARAMS_V5" (cd25eb16) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/q6adm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4228,7 +4228,7 @@ int adm_set_sound_focus(int port_id, int copp_idx,

		soundfocus_params.soundfocus_data.reserved = 0;

		atomic_set(&this_adm.copp.stat[port_idx][copp_idx], 0);
		atomic_set(&this_adm.copp.stat[port_idx][copp_idx], -1);
		ret = apr_send_pkt(this_adm.apr, (uint32_t *)&soundfocus_params);
		if (ret < 0) {
		pr_err("%s: Set params failed\n", __func__);
		@@ -4238,7 +4238,7 @@ int adm_set_sound_focus(int port_id, int copp_idx,
		}
		/* Wait for the callback */
		ret = wait_event_timeout(this_adm.copp.wait[port_idx][copp_idx],
		atomic_read(&this_adm.copp.stat[port_idx][copp_idx]),
		atomic_read(&this_adm.copp.stat[port_idx][copp_idx]) >= 0,
		msecs_to_jiffies(TIMEOUT_MS));
		if (!ret) {
		pr_err("%s: Set params timed out\n", __func__);