Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...

[~andy/linux] / sound / soc / fsl / imx-pcm-fiq.c

diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 920f945cb2f4e17d721f7e5f542ca0b454ba9b74..670b96b0ce2f50e417a9860fd3a73e3ad701c119 100644 (file)
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -34,7 +34,7 @@
 #include "imx-ssi.h"
 
 struct imx_pcm_runtime_data {
-       int period;
+       unsigned int period;
        int periods;
        unsigned long offset;
        unsigned long last_offset;
@@ -299,8 +299,8 @@ int imx_pcm_fiq_init(struct platform_device *pdev)
 
        imx_ssi_fiq_base = (unsigned long)ssi->base;
 
-       ssi->dma_params_tx.burstsize = 4;
-       ssi->dma_params_rx.burstsize = 6;
+       ssi->dma_params_tx.maxburst = 4;
+       ssi->dma_params_rx.maxburst = 6;
 
        ret = snd_soc_register_platform(&pdev->dev, &imx_soc_platform_fiq);
        if (ret)