summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorJon Hunter <jonathanh@nvidia.com>2023-06-13 10:34:53 +0100
committerMark Brown <broonie@kernel.org>2023-06-13 12:10:56 +0100
commitf9fd804aa0a36f15a35ca070ec4c52650876cc29 (patch)
tree0f84116004e025f44bcb4d3a34a69847f0ae8f93 /sound/soc/tegra
parentad24919540fb4df83981d469b5253cc1aecca939 (diff)
downloadlinux-stable-f9fd804aa0a36f15a35ca070ec4c52650876cc29.tar.gz
linux-stable-f9fd804aa0a36f15a35ca070ec4c52650876cc29.tar.bz2
linux-stable-f9fd804aa0a36f15a35ca070ec4c52650876cc29.zip
ASoC: tegra: Fix Master Volume Control
Commit 3ed2b549b39f ("ALSA: pcm: fix wait_time calculations") corrected the PCM wait_time calculations and in doing so reduced the calculated wait_time. This exposed an issue with the Tegra Master Volume Control (MVC) device where the reduced wait_time caused the MVC to fail. For now fix this by setting the default wait_time for Tegra to be 500ms. Fixes: 3ed2b549b39f ("ALSA: pcm: fix wait_time calculations") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20230613093453.13927-1-jonathanh@nvidia.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_pcm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c
index 468c8e77de21..0b69cebc9a33 100644
--- a/sound/soc/tegra/tegra_pcm.c
+++ b/sound/soc/tegra/tegra_pcm.c
@@ -117,6 +117,9 @@ int tegra_pcm_open(struct snd_soc_component *component,
return ret;
}
+ /* Set wait time to 500ms by default */
+ substream->wait_time = 500;
+
return 0;
}
EXPORT_SYMBOL_GPL(tegra_pcm_open);