diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:18 +0100 |
| commit | 3a2ac12f8eadaee97ad0337d81280547ab7a3311 (patch) | |
| tree | 92f9a25f8cdac19cfe174de41a3751cc36fa6a57 /sound/core | |
| parent | 7196be58ca832b6b37965921714849276f8996bc (diff) | |
| parent | e4a899d9bd5d18f5568be88f7ec8edf4cd107a94 (diff) | |
| download | lwn-3a2ac12f8eadaee97ad0337d81280547ab7a3311.tar.gz lwn-3a2ac12f8eadaee97ad0337d81280547ab7a3311.zip | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_dmaengine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 76cbb9ec953a..6542c4083594 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -65,13 +65,15 @@ int snd_hwparams_to_dma_slave_config(const struct snd_pcm_substream *substream, enum dma_slave_buswidth buswidth; int bits; - bits = snd_pcm_format_physical_width(params_format(params)); + bits = params_physical_width(params); if (bits < 8 || bits > 64) return -EINVAL; else if (bits == 8) buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE; else if (bits == 16) buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES; + else if (bits == 24) + buswidth = DMA_SLAVE_BUSWIDTH_3_BYTES; else if (bits <= 32) buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES; else |