Merge "ASoC: msm: qdsp6v2: Add mutex in afe_map_cal_data" into msm-4.9 (ee78986c) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/msm/qdsp6v2/q6afe.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -6366,6 +6366,7 @@ static int afe_map_cal_data(int32_t cal_type,
		}


		mutex_lock(&this_afe.afe_cmd_lock);
		atomic_set(&this_afe.mem_map_cal_index, cal_index);
		ret = afe_cmd_memory_map(cal_block->cal_data.paddr,
		cal_block->map_data.map_size);
		@@ -6378,10 +6379,12 @@ static int afe_map_cal_data(int32_t cal_type,
		__func__,
		&cal_block->cal_data.paddr,
		cal_block->map_data.map_size);
		mutex_unlock(&this_afe.afe_cmd_lock);
		goto done;
		}
		cal_block->map_data.q6map_handle = atomic_read(&this_afe.
		mem_map_cal_handles[cal_index]);
		mutex_unlock(&this_afe.afe_cmd_lock);
		done:
		return ret;
		}