Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / intel / avs / loader.c

diff --git a/sound/soc/intel/avs/loader.c b/sound/soc/intel/avs/loader.c
index 542fd44aa501e5a65469f1926054c16d474d2914..9e3f8ff33a87ac85b47d4b2552bc801f295a99b7 100644 (file)
--- a/sound/soc/intel/avs/loader.c
+++ b/sound/soc/intel/avs/loader.c
@@ -27,8 +27,8 @@
 #define APL_ROM_INIT_RETRIES           3
 
 #define AVS_FW_INIT_POLLING_US         500
-#define AVS_FW_INIT_TIMEOUT_US         3000000
 #define AVS_FW_INIT_TIMEOUT_MS         3000
+#define AVS_FW_INIT_TIMEOUT_US         (AVS_FW_INIT_TIMEOUT_MS * 1000)
 
 #define AVS_CLDMA_START_DELAY_MS       100