Merge "dsp: msm_audio_ion: store device pointer locally for all cases" into audio-drivers.lnx.3.0

This commit is contained in:
Linux Build Service Account
2018-06-05 21:58:28 -07:00
committed by Gerrit - the friendly Code Review server
當前提交 8af506f8d2

查看文件

@@ -652,7 +652,6 @@ static int msm_audio_smmu_init(struct device *dev)
goto fail_attach; goto fail_attach;
} }
msm_audio_ion_data.cb_dev = dev;
msm_audio_ion_data.mapping = mapping; msm_audio_ion_data.mapping = mapping;
INIT_LIST_HEAD(&msm_audio_ion_data.alloc_list); INIT_LIST_HEAD(&msm_audio_ion_data.alloc_list);
mutex_init(&(msm_audio_ion_data.list_mutex)); mutex_init(&(msm_audio_ion_data.list_mutex));
@@ -759,6 +758,8 @@ exit:
if (!rc) if (!rc)
msm_audio_ion_data.device_status |= MSM_AUDIO_ION_PROBED; msm_audio_ion_data.device_status |= MSM_AUDIO_ION_PROBED;
msm_audio_ion_data.cb_dev = dev;
return rc; return rc;
} }