Merge "ASoC: msm: qdsp6v2: Add mutex in afe_map_cal_data"

This commit is contained in:
Linux Build Service Account 2016-12-09 19:59:38 -08:00 committed by Gerrit - the friendly Code Review server
commit a7c2e1aaa5

View file

@ -6379,6 +6379,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);
@ -6391,10 +6392,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;
}