Merge tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / sound / core / pcm_dmaengine.c

diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
index 76cbb9ec953a0da66b403aa41687f2af93c0f690..6542c40835949f4df5d071d1c20384fa73329577 100644 (file)
--- 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