resolve merge conflicts of 1366cabc3d to stage-aosp-master.
am: 8c64904f61
* commit '8c64904f61caf03ebb916873c7d03d8a3aca7bfd':
qcom: audio: Fix missed msm8974 flags
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 2e954d6..6747b05 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1602,7 +1602,7 @@
* Sleep for the amount of buffer duration
*/
lock_output_stream(out);
- usleep(bytes * 1000000 / audio_stream_frame_size(&out->stream.common) /
+ usleep(bytes * 1000000 / audio_stream_out_frame_size(&out->stream.common) /
out_get_sample_rate(&out->stream.common));
pthread_mutex_unlock(&out->lock);
return bytes;