mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: soc-pcm: fix hwparams min/max init for dpcm

Browse source 
When runtime is initialized with dpcm_init_runtime_hw(), some of the
min/max calculations assume that defaults are set. For example
calculation of channel min/max values may be done using zero-initialized
data and soc_pcm_hw_update_chan() will always return max-channels of 0
in this case. This will result in failure to open the PCM at all.

Fix the issue by calling soc_pcm_hw_init() before calling any
soc_pcm_hw_update_*() functions.

Remove the conditional code on runtime->hw.formats as this field
is anyways set in soc_pcm_hw_init().

Fixes: 6cb56a4549 ("ASoC: soc-pcm: add soc_pcm_hw_update_chan()")
Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210214220414.2876690-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kai Vehmanen 2021-02-15 00:04:14 +02:00 committed by Mark Brown
parent debc71f26c
commit 140f553d12
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 2 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/soc-pcm.c
View file

@ -1531,12 +1531,10 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime,
{ {
struct snd_pcm_hardware *hw = &runtime->hw; struct snd_pcm_hardware *hw = &runtime->hw;
soc_pcm_hw_init(hw);
soc_pcm_hw_update_rate(hw, stream); soc_pcm_hw_update_rate(hw, stream);
soc_pcm_hw_update_chan(hw, stream); soc_pcm_hw_update_chan(hw, stream);
if (runtime->hw.formats) soc_pcm_hw_update_format(hw, stream);
runtime->hw.formats &= stream->formats;
else
runtime->hw.formats = stream->formats;
} }
static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream, static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream,