Merge "st-hal: Increase pcm read timeout limit"
diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index 6da1859..c7308cf 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -4506,10 +4506,10 @@
stdev->reset_backend = true;
ALOGD("%s: dedicated path %d, reset backend %d, tx %d, rx %d,"
- "concurrency session%s allowed",
- __func__, stdev->dedicated_sva_path, stdev->reset_backend,
- stdev->tx_concurrency_active, stdev->rx_concurrency_active,
- concurrency_ses_allowed? "" : " not");
+ " concurrency session%s allowed",
+ __func__, platform_stdev_is_dedicated_sva_path(stdev->platform),
+ stdev->reset_backend, stdev->tx_concurrency_active,
+ stdev->rx_concurrency_active, concurrency_ses_allowed? "" : " not");
return concurrency_ses_allowed;
}
diff --git a/st_hw_session_lsm.c b/st_hw_session_lsm.c
index aff5cb7..1e9867a 100644
--- a/st_hw_session_lsm.c
+++ b/st_hw_session_lsm.c
@@ -724,8 +724,9 @@
ALOGVV("%s: waiting on cond, bytes=%d", __func__, bytes);
/* Time out to unblock read thread in case if write thread is
stuck filling the buffers */
- GET_WAIT_TIMESPEC(tspec, convert_bytes_to_ms((requested_bytes * 2),
- &p_ses->common.config) * NSECS_PER_MSEC);
+ GET_WAIT_TIMESPEC(tspec, convert_bytes_to_ms(
+ (p_ses->lab_drv_buf_size * 4), &p_ses->common.config) *
+ NSECS_PER_MSEC);
ret = pthread_cond_timedwait(&p_ses->cond, &p_ses->lock, &tspec);
ALOGVV("%s: done waiting on cond", __func__);
if (ret) {