diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2018-08-27 15:26:47 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-28 20:35:49 +0200 |
| commit | e33ffbd9cd39da09831ce62c11025d830bf78d9e (patch) | |
| tree | 9e33da4db43e6c87e1129051dc64a8e555de7536 | |
| parent | ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl (diff) | |
| download | linux-e33ffbd9cd39da09831ce62c11025d830bf78d9e.tar.xz linux-e33ffbd9cd39da09831ce62c11025d830bf78d9e.zip | |
ASoC: dpcm: Properly initialise hw->rate_max
If the CPU DAI does not initialise rate_max, say if using
using KNOT or CONTINUOUS, then the rate_max field will be
initialised to 0. A value of zero in the rate_max field of
the hardware runtime will cause the sound card to support no
sample rates at all. Obviously this is not desired, just a
different mechanism is being used to apply the constraints. As
such update the setting of rate_max in dpcm_init_runtime_hw
to be consistent with the non-DPCM cases and set rate_max to
UINT_MAX if nothing is defined on the CPU DAI.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e8b98bfd4cf1..eb6f4f1b65a9 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1680,7 +1680,7 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime, struct snd_soc_pcm_stream *stream) { runtime->hw.rate_min = stream->rate_min; - runtime->hw.rate_max = stream->rate_max; + runtime->hw.rate_max = min_not_zero(stream->rate_max, UINT_MAX); runtime->hw.channels_min = stream->channels_min; runtime->hw.channels_max = stream->channels_max; if (runtime->hw.formats) |