diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-01-06 14:19:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-09 14:31:59 +0000 |
| commit | 16d7ea9167839d0b971ab29030886280595dd5fc (patch) | |
| tree | 53ef3ab32b49ffaeafdaa4265f30ba2f9e72800f /sound/soc/soc-pcm.c | |
| parent | 1e9de42f4324b91ce2e9da0939cab8fc6ae93893 (diff) | |
| download | blackbird-op-linux-16d7ea9167839d0b971ab29030886280595dd5fc.tar.gz blackbird-op-linux-16d7ea9167839d0b971ab29030886280595dd5fc.zip | |
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 <lars@metafoo.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 141a302e4e77..e7f16b54a97d 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)) |
