Merge tag 'asoc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Further updates for v4.2

There's a bunch of additional updates and fixes that came in since my
orignal pull request here, including DT support for rt5645 and fairly
large serieses of cleanups and improvements to tas2552 and rcar.

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 2890d744bb1b..3ddfd1f6c23c 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -487,7 +487,11 @@ int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps)
         caps->directions = device->directions;
         caps->residue_granularity = device->residue_granularity;
 
-        caps->cmd_pause = !!device->device_pause;
+        /*
+         * Some devices implement only pause (e.g. to get residuum) but no
+         * resume. However cmd_pause is advertised as pause AND resume.
+         */
+        caps->cmd_pause = !!(device->device_pause && device->device_resume);
         caps->cmd_terminate = !!device->device_terminate_all;
 
         return 0;