From: Lars-Peter Clausen Date: Mon, 6 Jan 2014 13:19:16 +0000 (+0100) Subject: ASoC: Allow PCMs to restrict the supported formats X-Git-Tag: upstream/snapshot3+hdmi~3494^2~11^2^2~2^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16d7ea9167839d0b971ab29030886280595dd5fc;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ASoC: Allow PCMs to restrict the supported formats Some DMA cores might add additional restrictions on which in memory audio formats can be supported by the compound sound card. If the PCM component specifies a set of formats it supports (by setting the formats field to non 0) take these into account when calculating the format set for the compound sound card. Signed-off-by: Lars-Peter Clausen Tested-by: Shawn Guo Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 141a302..e7f16b5 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -158,7 +158,10 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_hardware *hw, cpu_stream->channels_min); hw->channels_max = min(codec_stream->channels_max, cpu_stream->channels_max); - hw->formats = codec_stream->formats & cpu_stream->formats; + if (hw->formats) + 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))