diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 81c783b84e73..5ebf3e77c185 100755
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -11582,7 +11582,7 @@ static int afe_unmap_cal_data(int32_t cal_type,
 	atomic_set(&this_afe.mem_map_cal_handles[cal_index],
 		cal_block->map_data.q6map_handle);
 	atomic_set(&this_afe.mem_map_cal_index, cal_index);
-	ret = afe_cmd_memory_unmap_nowait(
+	ret = afe_cmd_memory_unmap(
 		cal_block->map_data.q6map_handle);
 	atomic_set(&this_afe.mem_map_cal_index, -1);
 	if (ret < 0) {