diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
commit | 977732b06045a508edc7b105e9fef524163616df (patch) | |
tree | fd8b03a23545ab601abc2ab0b13269e716aac9d9 /sound/soc/fsl | |
parent | 4b57895522b150966eebcf18f929e1c522d90bb9 (diff) | |
parent | acde50a7bf1fd6ae0baa4402f0a02c4b1bd4c990 (diff) |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/fsl_sai.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index ec79c3d5e65e..ee2671b80592 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -664,8 +664,7 @@ static int fsl_sai_probe(struct platform_device *pdev) if (sai->sai_on_imx) return imx_pcm_dma_init(pdev); else - return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); + return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); } static const struct of_device_id fsl_sai_ids[] = { |