diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-12 22:24:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-12 22:24:50 -0700 |
| commit | 28b1fae568b125aa8ef3f092b9dda1fdb94ba18a (patch) | |
| tree | f2710538446443891fdec1a4e9c264c79966ae9f /sound | |
| parent | Merge tag 'usb-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | Update imx-sdma cyclic handling to report residue (diff) | |
| download | linux-dev-28b1fae568b125aa8ef3f092b9dda1fdb94ba18a.tar.xz linux-dev-28b1fae568b125aa8ef3f092b9dda1fdb94ba18a.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"We have two small fixes. First one from Daniel to handle 0-length
packets for usb cppi dma. Second by Russell for imx-sdam cyclic
residue reporting"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
Update imx-sdma cyclic handling to report residue
dma: cppi41: handle 0-length packets
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-pcm-dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 0849b7b83f0a..0db94f492e97 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -59,7 +59,6 @@ int imx_pcm_dma_init(struct platform_device *pdev) { return devm_snd_dmaengine_pcm_register(&pdev->dev, &imx_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_NO_RESIDUE | SND_DMAENGINE_PCM_FLAG_COMPAT); } EXPORT_SYMBOL_GPL(imx_pcm_dma_init); |