Merge "dsp: voice_mhi: use modified mhi sync/put api" (830af558) · Commits · e / devices / android_kernel_xiaomi_nabu

dsp/q6voice.c

+12 −14

Original line number	Diff line number	Diff line
		@@ -6869,12 +6869,11 @@ int voc_end_voice_call(uint32_t session_id)

		voice_destroy_mvm_cvs_session(v);

		/* Fix me
		* ret = voice_mhi_end();
		* if (ret < 0)
		* pr_debug("%s: voice_mhi_end failed! %d\n",
		* __func__, ret);
		*/
		ret = voice_mhi_end();
		if (ret < 0)
		pr_debug("%s: voice_mhi_end failed! %d\n",
		__func__, ret);

		v->voc_state = VOC_RELEASE;
		} else {
		pr_err("%s: Error: End voice called in state %d\n",
		@@ -7209,14 +7208,13 @@ int voc_start_voice_call(uint32_t session_id)
		pr_debug("%s: Error retrieving CVD version %d\n",
		__func__, ret);
		}
		/* Fix me
		* ret = voice_mhi_start();
		* if (ret < 0) {
		* pr_debug("%s: voice_mhi_start failed! %d\n",
		* __func__, ret);
		* goto fail;
		* }
		*/

		ret = voice_mhi_start();
		if (ret < 0) {
		pr_debug("%s: voice_mhi_start failed! %d\n",
		__func__, ret);
		goto fail;
		}

		ret = voice_create_mvm_cvs_session(v);
		if (ret < 0) {

+6 −8

Original line number	Diff line number	Diff line
		@@ -238,9 +238,8 @@ int voice_mhi_start(void)
		goto done;
		}
		if (voice_mhi_lcl.vote_count == 0) {
		/* Fix me
		* ret = mhi_device_get_sync(voice_mhi_lcl.mhi_dev);
		*/
		ret = mhi_device_get_sync(voice_mhi_lcl.mhi_dev,
		MHI_VOTE_DEVICE);
		if (ret) {
		pr_err("%s: mhi_device_get_sync failed\n",
		__func__);
		@@ -279,11 +278,10 @@ int voice_mhi_end(void)
		mutex_unlock(&voice_mhi_lcl.mutex);
		return -EINVAL;
		}
		/* Fix me
		* if (voice_mhi_lcl.vote_count == 1)
		* mhi_device_put(voice_mhi_lcl.mhi_dev);
		* voice_mhi_lcl.vote_count--;
		*/

		if (voice_mhi_lcl.vote_count == 1)
		mhi_device_put(voice_mhi_lcl.mhi_dev, MHI_VOTE_DEVICE);
		voice_mhi_lcl.vote_count--;
		}
		mutex_unlock(&voice_mhi_lcl.mutex);