Merge "dsp: msm_audio_ion: check only for probe complete for ION alloc" (d59771fc) · Commits · e / devices / android_kernel_xiaomi_nabu

dsp/msm_audio_ion.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -347,8 +347,7 @@ int msm_audio_ion_alloc(struct dma_buf **dma_buf, size_t bufsz,
		int rc = -EINVAL;
		unsigned long err_ion_ptr = 0;

		if ((msm_audio_ion_data.smmu_enabled == true) &&
		!(msm_audio_ion_data.device_status & MSM_AUDIO_ION_PROBED)) {
		if (!(msm_audio_ion_data.device_status & MSM_AUDIO_ION_PROBED)) {
		pr_debug("%s:probe is not done, deferred\n", __func__);
		return -EPROBE_DEFER;
		}
		@@ -412,8 +411,7 @@ int msm_audio_ion_import(struct dma_buf **dma_buf, int fd,
		{
		int rc = 0;

		if ((msm_audio_ion_data.smmu_enabled == true) &&
		!(msm_audio_ion_data.device_status & MSM_AUDIO_ION_PROBED)) {
		if (!(msm_audio_ion_data.device_status & MSM_AUDIO_ION_PROBED)) {
		pr_debug("%s: probe is not done, deferred\n", __func__);
		return -EPROBE_DEFER;
		}