diff options
| author | Lars-Peter Clausen | 2013-11-27 09:58:17 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-11-27 17:42:37 +0100 |
| commit | 17b6c19b34b43a6a8dd5936b3cdbc63d7d1ae186 (patch) | |
| tree | 650b0fcb23bc682c49e02b54f6812712e6564648 /sound/soc | |
| parent | Linux 3.13-rc1 (diff) | |
| download | kernel-qcow2-linux-17b6c19b34b43a6a8dd5936b3cdbc63d7d1ae186.tar.gz kernel-qcow2-linux-17b6c19b34b43a6a8dd5936b3cdbc63d7d1ae186.tar.xz kernel-qcow2-linux-17b6c19b34b43a6a8dd5936b3cdbc63d7d1ae186.zip | |
ASoC: pcm: Fix rate_max calculation
In order to make sure that the sample rate is in the supported range of both
components the maximum rate of the card should be the minimum of the maximum
rate of each components. There is one special case to consider though, if
max_rate is set to 0 this means there is no maximum specified, so use
min_not_zero() macro which will give use the desired result.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Takashi iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
| -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 42782c01e413..9441e17d1147 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -153,7 +153,7 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_hardware *hw, struct snd_soc_pcm_stream *cpu_stream) { hw->rate_min = max(codec_stream->rate_min, cpu_stream->rate_min); - hw->rate_max = max(codec_stream->rate_max, cpu_stream->rate_max); + hw->rate_max = min_not_zero(codec_stream->rate_max, cpu_stream->rate_max); hw->channels_min = max(codec_stream->channels_min, cpu_stream->channels_min); hw->channels_max = min(codec_stream->channels_max, |