diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
| commit | d033de5ceee8333e4fee3d59a956244d3736102a (patch) | |
| tree | 5bdebcac18ed67890571632570c324e0c41a7223 /lib/dma-debug.c | |
| parent | ASoC: topology: Change pass number of DAI smaller than graph (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | linux-rng-d033de5ceee8333e4fee3d59a956244d3736102a.tar.xz linux-rng-d033de5ceee8333e4fee3d59a956244d3736102a.zip | |
Merge tag 'v4.2-rc6' into asoc-topology
Linux 4.2-rc6
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index ae4b65e17e64..dace71fe41f7 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page) unsigned long flags; phys_addr_t cln; + if (dma_debug_disabled()) + return; + if (!page) return; |