aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 11:31:18 -0400
committerMark Brown <broonie@linaro.org>2014-08-04 11:31:18 -0400
commit3a2ac12f8eadaee97ad0337d81280547ab7a3311 (patch)
tree92f9a25f8cdac19cfe174de41a3751cc36fa6a57 /sound/core
parent7196be58ca832b6b37965921714849276f8996bc (diff)
parente4a899d9bd5d18f5568be88f7ec8edf4cd107a94 (diff)
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_dmaengine.c4
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,
65 enum dma_slave_buswidth buswidth; 65 enum dma_slave_buswidth buswidth;
66 int bits; 66 int bits;
67 67
68 bits = snd_pcm_format_physical_width(params_format(params)); 68 bits = params_physical_width(params);
69 if (bits < 8 || bits > 64) 69 if (bits < 8 || bits > 64)
70 return -EINVAL; 70 return -EINVAL;
71 else if (bits == 8) 71 else if (bits == 8)
72 buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE; 72 buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE;
73 else if (bits == 16) 73 else if (bits == 16)
74 buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES; 74 buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
75 else if (bits == 24)
76 buswidth = DMA_SLAVE_BUSWIDTH_3_BYTES;
75 else if (bits <= 32) 77 else if (bits <= 32)
76 buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES; 78 buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
77 else 79 else