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/ux500 | |
parent | 4b57895522b150966eebcf18f929e1c522d90bb9 (diff) | |
parent | acde50a7bf1fd6ae0baa4402f0a02c4b1bd4c990 (diff) |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/ux500')
-rw-r--r-- | sound/soc/ux500/ux500_pcm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 51a66a87305a..f12c01dddc8d 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -147,7 +147,6 @@ int ux500_pcm_register_platform(struct platform_device *pdev) pcm_config = &ux500_dmaengine_pcm_config; ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE | SND_DMAENGINE_PCM_FLAG_COMPAT); if (ret < 0) { dev_err(&pdev->dev, |