diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-16 12:42:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-16 12:42:54 +0000 |
| commit | 7cfa7b547337faf5890c8c5f091e081fb79caf73 (patch) | |
| tree | b7a701162c0f6eb422417bf16f63b1ca7cc69e44 /sound/soc/adi | |
| parent | 99896f714a0a940d84476bc6208319f70af30789 (diff) | |
| parent | d70e861a3154833467023123e218e9b1ba558809 (diff) | |
| download | linux-7cfa7b547337faf5890c8c5f091e081fb79caf73.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/dma' into for-tiwai
Diffstat (limited to 'sound/soc/adi')
| -rw-r--r-- | sound/soc/adi/axi-i2s.c | 3 | ||||
| -rw-r--r-- | sound/soc/adi/axi-spdif.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/adi/axi-i2s.c b/sound/soc/adi/axi-i2s.c index 7f91a86dd734..6058c1fd5070 100644 --- a/sound/soc/adi/axi-i2s.c +++ b/sound/soc/adi/axi-i2s.c @@ -236,8 +236,7 @@ static int axi_i2s_probe(struct platform_device *pdev) if (ret) goto err_clk_disable; - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); if (ret) goto err_clk_disable; diff --git a/sound/soc/adi/axi-spdif.c b/sound/soc/adi/axi-spdif.c index 8db7a9920695..198e3a4640f6 100644 --- a/sound/soc/adi/axi-spdif.c +++ b/sound/soc/adi/axi-spdif.c @@ -229,8 +229,7 @@ static int axi_spdif_probe(struct platform_device *pdev) if (ret) goto err_clk_disable; - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE); + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); if (ret) goto err_clk_disable; |