Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55dcdb50 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: pcm: Use snd_pcm_rate_mask_intersect() helper 



Instead of open-coding the intersecting of two rate masks (and getting slightly
wrong for some of the corner cases) use the new snd_pcm_rate_mask_intersect()
helper function.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e3a9269f

sound/soc/soc-pcm.c

+2 −7
Original line number Diff line number Diff line
@@ -162,13 +162,8 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_runtime *runtime, 
		hw->formats &= codec_stream->formats & cpu_stream->formats;

	else

		hw->formats = codec_stream->formats & cpu_stream->formats;

	hw->rates = codec_stream->rates & cpu_stream->rates;

	if (codec_stream->rates

		& (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))

		hw->rates |= cpu_stream->rates;

	if (cpu_stream->rates

		& (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))

		hw->rates |= codec_stream->rates;

	hw->rates = snd_pcm_rate_mask_intersect(codec_stream->rates,

		cpu_stream->rates);



	hw->rate_min = 0;

	hw->rate_max = UINT_MAX;